diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index dafdd98f498e..a88947b45858 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -276,7 +276,7 @@ rec {
/* Like `mapAttrsRecursive', but it takes an additional predicate
- function that tells it whether to recursive into an attribute
+ function that tells it whether to recurse into an attribute
set. If it returns false, `mapAttrsRecursiveCond' does not
recurse, but does apply the map function. If it returns true, it
does recurse, and does not apply the map function.
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 160b684330ef..aa3fa7c6e56f 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -465,6 +465,11 @@ in mkLicense lset) ({
spdxId = "imagemagick";
};
+ imlib2 = {
+ spdxId = "Imlib2";
+ fullName = "Imlib2 License";
+ };
+
inria-compcert = {
fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
url = "https://compcert.org/doc/LICENSE.txt";
@@ -592,6 +597,11 @@ in mkLicense lset) ({
fullName = "MIT License";
};
+ mitAdvertising = {
+ spdxId = "MIT-advertising";
+ fullName = "Enlightenment License (e16)";
+ };
+
mpl10 = {
spdxId = "MPL-1.0";
fullName = "Mozilla Public License 1.0";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ca162d3ddba7..7fb0eb217533 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1179,14 +1179,14 @@
name = "Artturi N";
};
azahi = {
- email = "azahi@teknik.io";
- matrix = "@azahi:matrix.org";
+ name = "Azat Bahawi";
+ email = "azat@bahawi.net";
+ matrix = "@azahi:azahi.cc";
github = "azahi";
githubId = 22211000;
- name = "Azat Bahawi";
keys = [{
- longkeyid = "rsa2048/0xB40FCB6608BBE3B6";
- fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6";
+ longkeyid = "rsa4096/0xC8C6BDDB3847F72B";
+ fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B";
}];
};
ayazhafiz = {
@@ -2382,6 +2382,13 @@
githubId = 11145016;
name = "J.C.";
};
+ congee = {
+ email = "changshengwu@pm.me";
+ matrix = "@congeec:matrix.org";
+ github = "congee";
+ name = "Changsheng Wu";
+ githubId = 2083950;
+ };
contrun = {
email = "uuuuuu@protonmail.com";
github = "contrun";
@@ -3736,6 +3743,12 @@
githubId = 222467;
name = "Dmitry Ivanov";
};
+ Etjean = {
+ email = "et.jean@outlook.fr";
+ github = "Etjean";
+ githubId = 32169529;
+ name = "Etienne Jean";
+ };
etu = {
email = "elis@hirwing.se";
matrix = "@etu:semi.social";
@@ -5462,6 +5475,12 @@
githubId = 221929;
name = "Jean-Baptiste Giraudeau";
};
+ jc = {
+ name = "Josh Cooper";
+ email = "josh@cooper.is";
+ github = "joshua-cooper";
+ githubId = 35612334;
+ };
jceb = {
name = "jceb";
email = "jceb@e-jc.de";
@@ -5590,6 +5609,16 @@
githubId = 143075;
name = "James Felix Black";
};
+ jfchevrette = {
+ email = "jfchevrette@gmail.com";
+ github = "jfchevrette";
+ githubId = 3001;
+ name = "Jean-Francois Chevrette";
+ keys = [{
+ longkeyid = "rsa4096/0x67A0585801290DC6";
+ fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6";
+ }];
+ };
jflanglois = {
email = "yourstruly@julienlanglois.me";
github = "jflanglois";
@@ -7929,6 +7958,12 @@
fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83";
}];
};
+ mihnea-s = {
+ email = "mihn.stn@gmail.com";
+ github = "mihnea-s";
+ githubId = 43088426;
+ name = "Mihnea Stoian";
+ };
mikefaille = {
email = "michael@faille.io";
github = "mikefaille";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 361be88045f1..5b70a7b1e633 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -278,6 +278,13 @@ with lib.maintainers; {
scope = "Maintain SageMath and the dependencies that are likely to break it.";
};
+ sphinx = {
+ members = [
+ SuperSandro2000
+ ];
+ scope = "Maintain Sphinx related packages.";
+ };
+
serokell = {
# Verify additions by approval of an already existing member of the team.
members = [
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 04bb7ec12d3e..544b1e138989 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -802,6 +802,13 @@
loaded in the initrd.
+
+
+ nixos-generate-config now puts the dhcp
+ configuration in hardware-configuration.nix
+ instead of configuration.nix.
+
+
fetchFromSourcehut now allows fetching
@@ -894,6 +901,17 @@
warning.
+
+
+ The option
+ services.networking.networkmanager.enableFccUnlock
+ was added to support FCC unlock procedures. Since release
+ 1.18.4, the ModemManager daemon no longer automatically
+ performs the FCC unlock procedure by default. See
+ the
+ docs for more details.
+
+
programs.tmux has a new option
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a2e8038ae1f8..c748d2dae9e2 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -274,6 +274,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
+- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
+
- `fetchFromSourcehut` now allows fetching repositories recursively
using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`
is set to `true`.
@@ -301,6 +303,12 @@ In addition to numerous new and upgraded packages, this release has the followin
Reason is that the old name has been deprecated upstream.
Using the old option name will still work, but produce a warning.
+- The option
+ [services.networking.networkmanager.enableFccUnlock](#opt-services.networking.networkmanager.enableFccUnlock)
+ was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager
+ daemon no longer automatically performs the FCC unlock procedure by default. See
+ [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details.
+
- `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`.
diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix
index 964814e8c602..20bbe9ff5d99 100644
--- a/nixos/lib/qemu-common.nix
+++ b/nixos/lib/qemu-common.nix
@@ -22,7 +22,7 @@ rec {
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
qemuBinary = qemuPkg: {
- x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64";
+ x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index fe8c4fb1a6b5..57aef50a0f6b 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -279,7 +279,7 @@ if (`lsblk -o TYPE` =~ "lvm") {
push @initrdKernelModules, "dm-snapshot";
}
-my $virt = `systemd-detect-virt`;
+my $virt = `@detectvirt@`;
chomp $virt;
@@ -398,7 +398,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
# Maybe this is a bind-mount of a filesystem we saw earlier?
if (defined $fsByDev{$fields[2]}) {
# Make sure this isn't a btrfs subvolume.
- my $msg = `btrfs subvol show $rootDir$mountPoint`;
+ my $msg = `@btrfs@ subvol show $rootDir$mountPoint`;
if ($? != 0 || $msg =~ /ERROR:/s) {
my $path = $fields[3]; $path = "" if $path eq "/";
my $base = $fsByDev{$fields[2]};
@@ -436,7 +436,7 @@ EOF
# Is this a btrfs filesystem?
if ($fsType eq "btrfs") {
- my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+ my ($status, @info) = runCommand("@btrfs@ subvol show $rootDir$mountPoint");
if ($status != 0 || join("", @info) =~ /ERROR:/) {
die "Failed to retrieve subvolume info for $mountPoint\n";
}
@@ -558,6 +558,8 @@ if (!$noFilesystems) {
$fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n";
}
+my $networkingDhcpConfig = generateNetworkingDhcpConfig();
+
my $hwConfig = <the docs
+ for more details.
+ '';
+ };
};
};
@@ -438,7 +449,13 @@ in {
"NetworkManager/VPN/nm-sstp-service.name".source =
"${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name";
+
}
+ // optionalAttrs cfg.enableFccUnlock
+ {
+ "ModemManager/fcc-unlock.d".source =
+ "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*";
+ }
// optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != [])
{
"NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript;
diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix
index 22ece1883446..57cef7e44d50 100644
--- a/nixos/modules/services/security/haveged.nix
+++ b/nixos/modules/services/security/haveged.nix
@@ -3,12 +3,10 @@
with lib;
let
-
cfg = config.services.haveged;
in
-
{
###### interface
@@ -17,14 +15,11 @@ in
services.haveged = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable to haveged entropy daemon, which refills
- /dev/random when low.
- '';
- };
+ enable = mkEnableOption ''
+ haveged entropy daemon, which refills /dev/random when low.
+ NOTE: does nothing on kernels newer than 5.6.
+ '';
+ # source for the note https://github.com/jirka-h/haveged/issues/57
refill_threshold = mkOption {
type = types.int;
@@ -39,29 +34,44 @@ in
};
-
- ###### implementation
-
config = mkIf cfg.enable {
- systemd.services.haveged =
- { description = "Entropy Harvesting Daemon";
- unitConfig.Documentation = "man:haveged(8)";
- wantedBy = [ "multi-user.target" ];
+ # https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service
+ systemd.services.haveged = {
+ description = "Entropy Daemon based on the HAVEGE algorithm";
+ unitConfig = {
+ Documentation = "man:haveged(8)";
+ DefaultDependencies = false;
+ ConditionKernelVersion = "<5.6";
+ };
+ wantedBy = [ "sysinit.target" ];
+ after = [ "systemd-tmpfiles-setup-dev.service" ];
+ before = [ "sysinit.target" "shutdown.target" "systemd-journald.service" ];
- path = [ pkgs.haveged ];
-
- serviceConfig = {
- ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1";
- SuccessExitStatus = 143;
- PrivateTmp = true;
- PrivateDevices = true;
- PrivateNetwork = true;
- ProtectSystem = "full";
- ProtectHome = true;
- };
+ serviceConfig = {
+ ExecStart = "${pkgs.haveged}/bin/haveged -w ${toString cfg.refill_threshold} --Foreground -v 1";
+ Restart = "always";
+ SuccessExitStatus = "137 143";
+ SecureBits = "noroot-locked";
+ CapabilityBoundingSet = [ "CAP_SYS_ADMIN" "CAP_SYS_CHROOT" ];
+ # We can *not* set PrivateTmp=true as it can cause an ordering cycle.
+ PrivateTmp = false;
+ PrivateDevices = true;
+ ProtectSystem = "full";
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [ "@system-service" "newuname" "~@mount" ];
+ SystemCallErrorNumber = "EPERM";
};
+ };
};
}
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 6ee5b0fc54f7..8247a7e381c9 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
- ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix
+ ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
./cinnamon.nix
];
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 70911e02f7e0..6a7d2a8aa6cd 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -135,6 +135,7 @@ in
services.bamf.enable = true;
services.colord.enable = mkDefault true;
services.fwupd.enable = mkDefault true;
+ services.packagekit.enable = mkDefault true;
services.touchegg.enable = mkDefault true;
services.touchegg.package = pkgs.pantheon.touchegg;
services.tumbler.enable = mkDefault true;
@@ -272,7 +273,7 @@ in
})
(mkIf serviceCfg.apps.enable {
- environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [
+ environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([
elementary-calculator
elementary-calendar
elementary-camera
@@ -286,7 +287,11 @@ in
elementary-terminal
elementary-videos
epiphany
- ] config.environment.pantheon.excludePackages);
+ ] ++ lib.optionals config.services.flatpak.enable [
+ # Only install appcenter if flatpak is enabled before
+ # https://github.com/NixOS/nixpkgs/issues/15932 is resolved.
+ appcenter
+ ]) config.environment.pantheon.excludePackages;
# needed by screenshot
fonts.fonts = [
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml
index fe0a1c496223..202909d398f0 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.xml
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml
@@ -105,10 +105,10 @@ switchboard-with-plugs.override {
- AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this issue.
+ AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this issue.
- To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote:
+ If you are using Pantheon, AppCenter should be installed by default if you have Flatpak support enabled. If you also wish to add the appcenter Flatpak remote:
$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo
diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix
new file mode 100644
index 000000000000..d471673d4521
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.xserver.desktopManager.retroarch;
+
+in {
+ options.services.xserver.desktopManager.retroarch = {
+ enable = mkEnableOption "RetroArch";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.retroarch;
+ defaultText = literalExpression "pkgs.retroarch";
+ example = literalExpression "pkgs.retroarch-full";
+ description = "RetroArch package to use.";
+ };
+
+ extraArgs = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "--verbose" "--host" ];
+ description = "Extra arguments to pass to RetroArch.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.xserver.desktopManager.session = [{
+ name = "RetroArch";
+ start = ''
+ ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} &
+ waitPID=$!
+ '';
+ }];
+
+ environment.systemPackages = [ cfg.package ];
+ };
+
+ meta.maintainers = with maintainers; [ j0hax ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index c01a28f04f89..3fd4945ed352 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -441,6 +441,7 @@ in
resolv = handleTest ./resolv.nix {};
restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
restic = handleTest ./restic.nix {};
+ retroarch = handleTest ./retroarch.nix {};
riak = handleTest ./riak.nix {};
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
roundcube = handleTest ./roundcube.nix {};
diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix
new file mode 100644
index 000000000000..4c96f9eabc82
--- /dev/null
+++ b/nixos/tests/retroarch.nix
@@ -0,0 +1,49 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+ {
+ name = "retroarch";
+ meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; };
+
+ machine = { ... }:
+
+ {
+ imports = [ ./common/user-account.nix ];
+ services.xserver.enable = true;
+ services.xserver.desktopManager.retroarch = {
+ enable = true;
+ package = pkgs.retroarchFull;
+ };
+ services.xserver.displayManager = {
+ sddm.enable = true;
+ defaultSession = "RetroArch";
+ autoLogin = {
+ enable = true;
+ user = "alice";
+ };
+ };
+ };
+
+ testScript = { nodes, ... }:
+ let
+ user = nodes.machine.config.users.users.alice;
+ xdo = "${pkgs.xdotool}/bin/xdotool";
+ in ''
+ with subtest("Wait for login"):
+ start_all()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+
+ with subtest("Check RetroArch started"):
+ machine.wait_until_succeeds("pgrep retroarch")
+ machine.wait_for_window("^RetroArch ")
+
+ with subtest("Check configuration created"):
+ machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg")
+
+ with subtest("Wait to get a screenshot"):
+ machine.execute(
+ "${xdo} key Alt+F1 sleep 10"
+ )
+ machine.screenshot("screen")
+ '';
+ })
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 0e4afa4af7cf..9d4c522edc1a 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -24,7 +24,7 @@
, expat
, libid3tag
, libopus
-, ffmpeg
+, ffmpeg_4
, soundtouch
, pcre
/*, portaudio - given up fighting their portaudio.patch */
@@ -123,7 +123,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expat
- ffmpeg
+ ffmpeg_4
file
flac
libid3tag
diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix
new file mode 100644
index 000000000000..45ee78917ace
--- /dev/null
+++ b/pkgs/applications/audio/redux/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchurl
+, libX11
+, alsa-lib
+, autoPatchelfHook
+, releasePath ? null
+}:
+
+# To use the full release version (same as renoise):
+# 1) Sign into https://backstage.renoise.com and download the release version to some stable location.
+# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
+# Note: Renoise creates an individual build for each license which screws somewhat with the
+# use of functions like requireFile as the hash will be different for every user.
+
+stdenv.mkDerivation rec {
+ pname = "redux";
+ version = "1.2.2";
+
+ src = if releasePath != null then releasePath
+ else fetchurl {
+ url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux.tar.gz";
+ sha256 = "0zbwsg7nh9x3q29jv2kpqb3vwi0ksdwybhb4m2qr95rxrpx1kxhm";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [ libX11 alsa-lib stdenv.cc.cc.lib ];
+
+ installPhase = ''
+ runHook preInstall
+
+ OUTDIR=$out/lib/vst2/RenoiseRedux.vst2
+ mkdir -p $OUTDIR
+ cp -r ./renoise_redux_x86_64/* $OUTDIR
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Sample-based instrument, with a powerful phrase sequencer";
+ homepage = "https://www.renoise.com/products/redux";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ mihnea-s ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index fa511837207a..52789d64d10a 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "snd";
- version = "22.0";
+ version = "22.1";
src = fetchurl {
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
- sha256 = "sha256-QK5lq2ek1yn3G0Ecs+TFIG5ST3lAETiyxuXIic3v1ik=";
+ sha256 = "sha256-jrH0XRvPj9ySd8FSrOKf6qP5T1YSKrYBNHl6fz5dhkI=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index b0e26a8c7f1d..9207d375f30e 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "tiled";
- version = "1.7.2";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yQWe27zLWOnRQk+MEpuWs8CFP/le3PQ+yziB0ikNang=";
+ sha256 = "sha256-rJY2PNUxKAv+uQKBwu5kPuwyWkzOK9bg8NJViSgG29I=";
};
nativeBuildInputs = [ pkg-config qmake ];
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 51a9b9af5bfd..0cb09814c0f0 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.2.4186";
+ version = "8.2.4227";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph";
+ sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index fe387ddc273b..f92f3686611f 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -1,6 +1,9 @@
{ lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
-, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }:
+, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences
+, runCommand
+, graphicsmagick # for passthru.tests
+}:
stdenv.mkDerivation rec {
pname = "graphicsmagick";
@@ -33,13 +36,23 @@ stdenv.mkDerivation rec {
# Remove CFLAGS from the binaries to avoid closure bloat.
# In the past we have had -dev packages in the closure of the binaries soley due to the string references.
postConfigure = ''
- nuke-refs ./magick/magick_config.h
+ nuke-refs -e $out ./magick/magick_config.h
'';
postInstall = ''
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
'';
+ passthru = {
+ tests = {
+ issue-157920 = runCommand "issue-157920-regression-test" {
+ buildInputs = [ graphicsmagick ];
+ } ''
+ gm convert ${graphviz}/share/graphviz/doc/pdf/neatoguide.pdf jpg:$out
+ '';
+ };
+ };
+
meta = {
homepage = "http://www.graphicsmagick.org";
description = "Swiss army knife of image processing";
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index d3640a656f13..110a7e513e32 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -9,20 +9,27 @@ stdenv.mkDerivation {
};
buildInputs = [ libX11 imlib2 libXinerama ];
+
buildPhase = ''
- gcc -g imlibsetroot.c -o imlibsetroot \
- `imlib2-config --cflags` `imlib2-config --libs` \
- -I/include/X11/extensions -lXinerama -lX11
+ runHook preBuild
+
+ gcc -g imlibsetroot.c -o imlibsetroot \
+ -I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \
+ -I${libX11.dev}/include -lXinerama -lX11
+
+ runHook postBuild
'';
+
installPhase = ''
- mkdir -p $out/bin
- install -m 755 imlibsetroot $out/bin
+ runHook preInstall
+ install -D -m 0755 imlibsetroot -t $out/bin
+ runHook postInstall
'';
meta = with lib; {
description = "A Xinerama Aware Background Changer";
homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/";
- license = licenses.gpl2;
+ license = licenses.mitAdvertising;
platforms = platforms.linux;
maintainers = with maintainers; [ dwarfmaster ];
};
diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix
index 7133c914b66a..8396ba55638f 100644
--- a/pkgs/applications/graphics/pixinsight/default.nix
+++ b/pkgs/applications/graphics/pixinsight/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot
-, mime-types, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig
+, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig
, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim
# Qt 5 subpackages
, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
fakeroot
wrapQtAppsHook
autoPatchelfHook
- mime-types
+ mailcap
libudev0-shim
];
diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
index d09eab0f85b2..bec3164a008d 100644
--- a/pkgs/applications/misc/batsignal/default.nix
+++ b/pkgs/applications/misc/batsignal/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "batsignal";
- version = "1.3.2";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "electrickite";
repo = "batsignal";
rev = version;
- sha256 = "sha256-+5yAwBUyhqmoV8l8VwIQMxnSgjNZNbGfGajPhA+IFwA=";
+ sha256 = "sha256-B2HAEJj8TX44YagJ993d7js/wi1D39/Hi85rxJoKa3U=";
};
buildInputs = [ libnotify glib ];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index b2199975193f..29a129192960 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -77,6 +77,11 @@ python3.pkgs.buildPythonApplication {
postPatch = ''
substituteInPlace contrib/requirements/requirements.txt \
--replace "dnspython>=2.0,<2.1" "dnspython>=2.0"
+
+ # according to upstream, this is fine
+ # https://github.com/spesmilo/electrum/issues/7361
+ substituteInPlace contrib/requirements/requirements.txt \
+ --replace "qdarkstyle<2.9" "qdarkstyle>=2.7"
'';
patches = [
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index a070bc321b74..416adbe60c88 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -76,6 +76,11 @@ python3.pkgs.buildPythonApplication {
prePatch = ''
substituteInPlace contrib/requirements/requirements.txt \
--replace "dnspython>=2.0,<2.1" "dnspython>=2.0"
+
+ # according to upstream, this is fine
+ # https://github.com/spesmilo/electrum/issues/7361
+ substituteInPlace contrib/requirements/requirements.txt \
+ --replace "qdarkstyle<2.9" "qdarkstyle>=2.7"
'';
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 8f5eaf47b550..12649b5b7fe5 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.20.3";
+ version = "1.20.4";
src = fetchPypi {
inherit pname version;
- sha256 = "6d1d97bd08a2a0dcfb0578e759fb83c4902b395405b3e3238673f684973b0556";
+ sha256 = "sha256-K22ee6qcVXbJJKH5/6EMvSdSNKBb7xAP++1s+A5ENu4=";
};
propagatedBuildInputs = [ requests yt-dlp ];
diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix
new file mode 100644
index 000000000000..03f25588682d
--- /dev/null
+++ b/pkgs/applications/misc/leetcode-cli/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, fetchCrate
+, rustPlatform
+, pkg-config
+, openssl
+, dbus
+, sqlite
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "leetcode-cli";
+ version = "0.3.10";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA=";
+ };
+
+ cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo=";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ openssl
+ dbus
+ sqlite
+ ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+ meta = with lib; {
+ description = "May the code be with you 👻";
+ longDescription = "Use leetcode.com in command line";
+ homepage = "https://github.com/clearloop/leetcode-cli";
+ license = licenses.mit;
+ maintainers = with maintainers; [ congee ];
+ mainProgram = "leetcode";
+ };
+}
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 2e75977d68a2..86ed90cbd4a1 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -21,10 +21,11 @@ mkDerivation rec {
version = "3.27.1.6";
src = fetchFromGitHub {
+ name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "sha256-ouvWE1fa4DfPLqFYuMsUPWDx/NUaoCc7TfR6Ed0uuF4=";
+ sha256 = "sha256-NnaCwbk8w0ZPnBz7xxs5LMFMUSnEERCSRBXpJL0u+s0=";
};
patches = [
diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix
index 08c88e376bb6..7e76d4a4e0bc 100644
--- a/pkgs/applications/misc/tty-share/default.nix
+++ b/pkgs/applications/misc/tty-share/default.nix
@@ -3,13 +3,13 @@
# Upstream has a `./vendor` directory with all deps which we rely upon.
buildGoPackage rec {
pname = "tty-share";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "elisescu";
repo = "tty-share";
rev = "v${version}";
- sha256 = "sha256-+bdQ7KyGEdJJAopzGnDOcLvFNyiKqpagPR1EoU1VR5E=";
+ sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc=";
};
goPackagePath = "github.com/elisescu/tty-share";
diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix
index ef4a0ab7e59d..0193321ef4be 100644
--- a/pkgs/applications/misc/wike/default.nix
+++ b/pkgs/applications/misc/wike/default.nix
@@ -14,13 +14,13 @@ let
]);
in stdenv.mkDerivation rec {
pname = "wike";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "hugolabe";
repo = "Wike";
rev = version;
- sha256 = "sha256-Cv4gmAUqViHJEAgueLOUX+cI775QopfRA6vmHgQvCUY=";
+ sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 16be1b2f7c01..110d06071adf 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.35.100";
+ version = "1.35.101";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "ToPh2uhWHMR6CS7wtos26iVuyKLXi3ctOP/dFyeosoM=";
+ sha256 = "q5GL6R87b3iYLiM9oJQgCOVeXzyNFY6x8fQ9KsDN7gk=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 482914ace0a5..4285ee3298b8 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.10.3";
+ version = "1.10.4";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-4Xjm4P4uK0aZxUT0WzcSDdY6rEeh5YFwsMfVtFB14No=";
+ sha256 = "sha256-tj/RDGPu1hB67eTdq7NrbRd+OwBhIAm1lBgoft5m4v4=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix
index ccbc7a8dc8fb..7c1cb7f04a71 100644
--- a/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, lispPackages
, makeWrapper, wrapGAppsHook, gst_all_1
, glib, gdk-pixbuf, cairo
-, mime-types, pango, gtk3
+, mailcap, pango, gtk3
, glib-networking, gsettings-desktop-schemas
, xclip, notify-osd, enchant
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
glib gdk-pixbuf cairo
- mime-types pango gtk3
+ mailcap pango gtk3
glib-networking gsettings-desktop-schemas
xclip notify-osd enchant
] ++ gstBuildInputs;
diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix
index 41d125f6cca1..05c985d9d97a 100644
--- a/pkgs/applications/networking/cluster/clusterctl/default.nix
+++ b/pkgs/applications/networking/cluster/clusterctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "clusterctl";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "cluster-api";
rev = "v${version}";
- sha256 = "sha256-mebxbS0PVP2EdYt31G0HQ0Z+wxpXOe9/xaKdH0wwB60=";
+ sha256 = "sha256-bgc9M7shcgL1gQ9klUP0JIY4UeraO1oLsLEdG5tOLpY=";
};
vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0=";
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index 35da4e2fbe2b..30a12281c872 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
- version = "0.26.2";
- sha256 = "1p99bjqlwyibycpby9fnzfmfd826zaw7k7d4f4p4gjpd7dphlrp1";
- manifestsSha256 = "1s1hx754xa63s7in7gcrr146nkyvadba6vmy1bagjcxibxc3qdqy";
+ version = "0.26.3";
+ sha256 = "0j6zvcjykk775nnj8s0n5154lqslgfpi8884gh6sv204z2drfjff";
+ manifestsSha256 = "1pfk0fj228zy0m1cz0400l4r41l7p0gsdq5lqnl3a8vgb4f6i41q";
manifests = fetchzip {
url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
- vendorSha256 = "sha256-9MMEqJiplg7kmMmbHnTBEQ+GF+dBL7bpzs5Q0IYcMXU=";
+ vendorSha256 = "sha256-34hSbOB7n9OFpVqe8y1+jAC3j0HEBg9LhYOvVGH9kLY=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix
new file mode 100644
index 000000000000..6920c11dcae5
--- /dev/null
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+
+buildGoModule rec {
+ pname = "glooctl";
+ version = "1.10.6";
+
+ src = fetchFromGitHub {
+ owner = "solo-io";
+ repo = "gloo";
+ rev = "v${version}";
+ sha256 = "sha256-t63tK0hwbVnUP9UxS8g3uzL3rBvKR10vu1E85mNV3E0=";
+ };
+
+ subPackages = [ "projects/gloo/cli/cmd" ];
+ vendorSha256 = "sha256-IBuAUKbX1esx2p4Q/b3UxQH9S3VVNYZcn5vRKtmhO0A=";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ mv $out/bin/cmd $out/bin/glooctl
+
+ export HOME=$TMP
+ installShellCompletion --cmd glooctl \
+ --bash <($out/bin/glooctl completion bash) \
+ --zsh <($out/bin/glooctl completion zsh)
+ '';
+
+ ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ];
+
+ meta = with lib; {
+ description = "glooctl is the unified CLI for Gloo";
+ homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nelsonjeppesen ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index 8d22cabaab26..4519d7676296 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.23.9";
+ version = "0.24.1";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-sxOUO5dLWBgNvbi42/aoN4YQStuNuXxWuM3WJxh1ucg=";
+ sha256 = "sha256-lvls/2ukwcHSJCgZkumuFMtJTKOBl0CXijedjcGJePw=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index 3127a94421c0..30966deb0caf 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -11,15 +11,15 @@
buildGoModule rec {
pname = "werf";
- version = "1.2.60";
+ version = "1.2.65";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- sha256 = "sha256-EEceAIlbwfKD2K0pJxmCRn6+yc5RVBassENuMS48794=";
+ sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk=";
};
- vendorSha256 = "sha256-3hNqCIx6S1pEzLMRVmr04pmQrrc3T/Q/FsB/DCAVRCY=";
+ vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28=";
proxyVendor = true;
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 5ba7a1f7b205..d9683740667c 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -12,6 +12,7 @@
, Security
, AppKit
, CoreServices
+, desktopToDarwinBundle
}:
let
@@ -36,7 +37,7 @@ mkYarnPackage rec {
sha256 = pinData.desktopYarnHash;
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
seshat = callPackage ./seshat { inherit CoreServices; };
keytar = callPackage ./keytar { inherit Security AppKit; };
diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
index a324d061aa73..f39b731132ea 100644
--- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
@@ -7,7 +7,7 @@
, autoreconfHook
, pkg-config
, perl # for pod2man
-, ffmpeg
+, ffmpeg_4
, pjsip
, alsa-lib
, asio
@@ -39,7 +39,7 @@
let
readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file));
- ffmpeg-jami = ffmpeg.overrideAttrs (old:
+ ffmpeg-jami = ffmpeg_4.overrideAttrs (old:
let
patch-src = src + "/daemon/contrib/src/ffmpeg/";
in
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
index 614183b72d08..aff74a174b9c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm
-, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
+, libjpeg, openssl, libopus, ffmpeg_4, alsa-lib, libpulseaudio, protobuf
, xorg, libXtst
}:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
buildInputs = [
- libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf
+ libjpeg openssl libopus ffmpeg_4 alsa-lib libpulseaudio protobuf
xorg.libX11 libXtst
];
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 37099496b666..7cac4baefafc 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "qownnotes";
- version = "22.2.1";
+ version = "22.2.2";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Fetch the checksum of current version with curl:
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256
- sha256 = "26dfd41430e9efa5cc93c2d67156387a564efd0843c2020284658100b298d54c";
+ sha256 = "sha256-b2yoy1WhnPTE2fNeHVvkwKLzjeaSBhHiQgSZ9VHwkGY=";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/science/electronics/lepton-eda/default.nix b/pkgs/applications/science/electronics/lepton-eda/default.nix
index 3e701dc93c4f..8d4217d0aba3 100644
--- a/pkgs/applications/science/electronics/lepton-eda/default.nix
+++ b/pkgs/applications/science/electronics/lepton-eda/default.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "lepton-eda";
- version = "1.9.16-20210731";
+ version = "1.9.17-20211219";
src = fetchurl {
url = "https://github.com/lepton-eda/lepton-eda/releases/download/${version}/lepton-eda-${builtins.head (lib.splitString "-" version)}.tar.gz";
- sha256 = "sha256-xdJ11M4RXNF6ePZD6Y+/DUdO21AFLbydZcq9nWg0+Yk=";
+ sha256 = "sha256-lOneKeJUcw6jOX/3iv9BDWOJ3xip/vGhzxHHNAbtsS8=";
};
nativeBuildInputs = [ pkg-config makeWrapper texinfo autoreconfHook ];
diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix
index 22d1c92e1ec3..78943457d3b2 100644
--- a/pkgs/applications/science/math/rofi-calc/default.nix
+++ b/pkgs/applications/science/math/rofi-calc/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "rofi-calc";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
- sha256 = "NbWXMash0pK7Y9gOEBbL7zXjFytoeZBN9/wIbRTvQ8g=";
+ sha256 = "sha256-sfUcBSUYf/+neBAhEd5LAtMOfIbdXM/ieUOztjk8Pwg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 95b01d9f3f58..019694fd265e 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -114,18 +114,26 @@ stdenv.mkDerivation rec {
# strictly necessary, but keeps us from littering in the user's HOME.
./patches/sympow-cache.patch
+ # Upstream will wait until Sage 9.7 to upgrade to linbox 1.7 because it
+ # does not support gcc 6. We can upgrade earlier.
+ # https://trac.sagemath.org/ticket/32959
+ ./patches/linbox-1.7-upgrade.patch
+
# https://trac.sagemath.org/ticket/32968
(fetchSageDiff {
- base = "9.5.beta8";
+ base = "9.5";
name = "sphinx-4.3-update.patch";
rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841";
sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q=";
})
- # Upstream has not upgraded to linbox 1.7 yet because it conflicts with
- # pre-4.2.1p3 versions of Singular, but we don't have this problem.
- # https://trac.sagemath.org/ticket/32959
- ./patches/linbox-1.7-upgrade.patch
+ # https://trac.sagemath.org/ticket/33189
+ (fetchSageDiff {
+ base = "9.5";
+ name = "arb-2.22-update.patch";
+ rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579";
+ sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index 5dea2c7653aa..18dba2952cad 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -3,7 +3,7 @@
let
name = "scilab-bin-${ver}";
- ver = "6.0.2";
+ ver = "6.1.1";
badArch = throw "${name} requires i686-linux or x86_64-linux";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
if stdenv.hostPlatform.system == "i686-linux" then
"0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib"
else if stdenv.hostPlatform.system == "x86_64-linux" then
- "05clcdgry90drirl3swbxn5q36fmgknnhs6h5pr7mmrzfr6r818w"
+ "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk="
else
badArch;
};
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 073b50c4bd51..13da857b790e 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.34.1";
+ version = "2.35.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs";
+ sha256 = "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 04911562a347..0928c7617f90 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -47,13 +47,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "64.0.0";
+ version = "65.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "sha256-tg9rjTbprcVkzUUVWCKqF1dzIjFKjzIqrVADtuUU9Fk=";
+ sha256 = "1zphcpfrzic9ialx3xxi2ywzxnllys667vy140bgdshzr798sg2p";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 1715ce4a6a17..0c435bfbe158 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg
+{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
@@ -93,11 +93,12 @@ in
stdenv.mkDerivation rec {
pname = "mplayer";
- version = "1.4";
+ version = "unstable-2022-02-03";
- src = fetchurl {
- url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz";
- sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2";
+ src = fetchsvn {
+ url = "svn://svn.mplayerhq.hu/mplayer/trunk";
+ rev = "38331";
+ sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi";
};
prePatch = ''
@@ -106,8 +107,6 @@ stdenv.mkDerivation rec {
rm -rf ffmpeg
'';
- patches = [ ./svn-r38199-ffmpeg44fix.patch ];
-
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib;
@@ -163,7 +162,6 @@ stdenv.mkDerivation rec {
(if pulseSupport then "--enable-pulse" else "--disable-pulse")
(if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2")
"--disable-xanim"
- "--disable-ivtv"
"--disable-xvid --disable-xvid-lavc"
"--disable-ossaudio"
"--disable-ffmpeg_a"
diff --git a/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch b/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch
deleted file mode 100644
index 4137989fcb54..000000000000
--- a/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libmpcodecs/ad_spdif.c
-===================================================================
-diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c
---- a/libmpcodecs/ad_spdif.c (revision 38198)
-+++ b/libmpcodecs/ad_spdif.c (revision 38199)
-@@ -298,14 +298,8 @@
- if (spdif_ctx->header_written)
- av_write_trailer(lavf_ctx);
- av_freep(&lavf_ctx->pb);
-- if (lavf_ctx->streams) {
-- av_freep(&lavf_ctx->streams[0]->codec);
-- av_freep(&lavf_ctx->streams[0]->info);
-- av_freep(&lavf_ctx->streams[0]);
-- }
-- av_freep(&lavf_ctx->streams);
-- av_freep(&lavf_ctx->priv_data);
-+ avformat_free_context(lavf_ctx);
-+ lavf_ctx = NULL;
- }
-- av_freep(&lavf_ctx);
- av_freep(&spdif_ctx);
- }
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 31f478c47c0b..f8bed2365638 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -6,7 +6,7 @@
, addOpenGLRunpath
, cmake
, fdk_aac
-, ffmpeg
+, ffmpeg_4
, jansson
, libjack2
, libxkbcommon
@@ -73,7 +73,7 @@ mkDerivation rec {
buildInputs = [
curl
fdk_aac
- ffmpeg
+ ffmpeg_4
jansson
libcef
libjack2
diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix
index 6dc8aa56b5cc..f2753affa563 100644
--- a/pkgs/applications/video/ustreamer/default.nix
+++ b/pkgs/applications/video/ustreamer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ustreamer";
- version = "4.9";
+ version = "4.11";
src = fetchFromGitHub {
owner = "pikvm";
repo = "ustreamer";
rev = "v${version}";
- sha256 = "sha256-dYwR+D2g4PxYyhsH9mGwgzTQ2Vw5UpMSomTl828gFvM=";
+ sha256 = "sha256-MTzlhnnDVZzS3lnYe3P/Hi6pi6f4B0+ejmDwV0f9juI=";
};
buildInputs = [ libbsd libevent libjpeg ];
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 7aa780f8a7f2..a5e65480b2bf 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -10,7 +10,7 @@
, avahi
, dbus
, faad2
-, ffmpeg
+, ffmpeg_4
, flac
, fluidsynth
, freefont_ttf
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
avahi
dbus
faad2
- ffmpeg
+ ffmpeg_4
flac
fluidsynth
fribidi
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
index cbd7d8e5512d..2889d09183d7 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [
docker
- (python3.withPackages (ps: [ ps.lark-parser ps.requests ]))
+ (python3.withPackages (ps: [ ps.lark ps.requests ]))
];
configureFlags = let
- pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]);
+ pythonEnv = python3.withPackages (ps: [ ps.lark ps.requests ]);
in [
"--with-python=${pythonEnv}/bin/python3"
];
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 75a3dbf37462..36ce5c3ade28 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
- version = "1.22.1";
+ version = "1.23.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y=";
+ sha256 = "sha256-F6eWC1GhPJRyra7U80tBxfokY1PIJmsuF3H9536tPxA=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index c45c519f370c..2ae0aca5845e 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -33,24 +33,16 @@
, nixosTestRunner ? false
}:
-let
- audio = lib.optionalString alsaSupport "alsa,"
- + lib.optionalString pulseSupport "pa,"
- + lib.optionalString sdlSupport "sdl,"
- + lib.optionalString jackSupport "jack,";
-
-in
-
stdenv.mkDerivation rec {
pname = "qemu"
+ lib.optionalString xenSupport "-xen"
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests";
- version = "6.1.0";
+ version = "6.2.0";
src = fetchurl {
url= "https://download.qemu.org/qemu-${version}.tar.xz";
- sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f";
+ sha256 = "0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -101,55 +93,7 @@ stdenv.mkDerivation rec {
sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2";
revert = true;
})
- (fetchpatch {
- name = "CVE-2021-3713.patch"; # remove with next release
- url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch";
- sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf";
- })
- # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests
- # on some systems. Remove with next release.
- (fetchpatch {
- name = "fix-crash-in-v9fs_walk.patch";
- url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch";
- sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8=";
- })
- # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release.
- (fetchpatch {
- name = "fix-aio-discard-return-value.patch";
- url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch";
- sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M=";
- })
- # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release.
- (fetchpatch {
- name = "qxl-fix-pre-save-logic.patch";
- url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch";
- sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8=";
- })
- # Fixes socket_sockaddr_to_address_unix assertion errors in some setups. Remove with next release.
- (fetchpatch {
- name = "fix-unix-socket-path-copy-again.patch";
- url = "https://gitlab.com/qemu-project/qemu/-/commit/118d527f2e4baec5fe8060b22a6212468b8e4d3f.patch";
- sha256 = "sha256-ox+JSpc0pqd3bMi5Ot7ljQyk70SX8g+BLufR06mZPps=";
- })
- ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch
- ++ lib.optionals stdenv.hostPlatform.isMusl [
- ./sigrtminmax.patch
- (fetchpatch {
- url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch";
- sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";
- })
- ] ++ lib.optionals stdenv.isDarwin [
- # The Hypervisor.framework support patch converted something that can be applied:
- # * https://patchwork.kernel.org/project/qemu-devel/list/?series=548227
- # The base revision is whatever commit there is before the series starts:
- # * https://github.com/patchew-project/qemu/commits/patchew/20210916155404.86958-1-agraf%40csgraf.de
- # The target revision is what patchew has as the series tag from patchwork:
- # * https://github.com/patchew-project/qemu/releases/tag/patchew%2F20210916155404.86958-1-agraf%40csgraf.de
- (fetchpatch {
- url = "https://github.com/patchew-project/qemu/compare/7adb961995a3744f51396502b33ad04a56a317c3..d2603c06d9c4a28e714b9b70fe5a9d0c7b0f934d.diff";
- sha256 = "sha256-nSi5pFf9+EefUmyJzSEKeuxOt39ztgkXQyUB8fTHlcY=";
- })
- ];
+ ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
postPatch = ''
# Otherwise tries to ensure /var/run exists.
@@ -180,12 +124,9 @@ stdenv.mkDerivation rec {
--replace '$source_path/VERSION' '$source_path/QEMU_VERSION'
substituteInPlace meson.build \
--replace "'VERSION'" "'QEMU_VERSION'"
- '' + lib.optionalString stdenv.hostPlatform.isMusl ''
- NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H"
'';
configureFlags = [
- "--audio-drv-list=${audio}"
"--disable-strip" # We'll strip ourselves after separating debug info.
"--enable-docs"
"--enable-tools"
diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch
deleted file mode 100644
index 41050447ac64..000000000000
--- a/pkgs/applications/virtualization/qemu/sigrtminmax.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Fri, 17 Aug 2018 00:22:35 -0500
-Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0
-
----
- linux-user/signal.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 602b631b92..87f9240134 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -26,6 +26,13 @@
- #include "trace.h"
- #include "signal-common.h"
-
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN 32
-+#endif
-+#ifndef __SIGRTMAX
-+#define __SIGRTMAX (NSIG-1)
-+#endif
-+
- struct target_sigaltstack target_sigaltstack_used = {
- .ss_sp = 0,
- .ss_size = 0,
---
-2.18.0
-
diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix
index a97c43495703..af2c4939ad04 100644
--- a/pkgs/applications/virtualization/seabios/default.nix
+++ b/pkgs/applications/virtualization/seabios/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "seabios";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchurl {
url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz";
- sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b";
+ sha256 = "sha256-YownF8mUMmtFMlFXPRBZ4qOhEtSqSIds4nyz8d4ZiPg=";
};
nativeBuildInputs = [ python3 ];
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 4d6fb0ef4afa..6589cccfe2f9 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
- version = "3.8.5";
+ version = "3.8.6";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
- sha256 = "sha256-f/94tcB7XU0IJpvSZ6xemUOQ+TMyHlTv1rfIZoMVPOQ=";
+ sha256 = "sha256-u1o7dnCsnHpLPOWyyfPWtb5g4hsI0zjJ39q7eyqZ9Sg=";
};
goPackagePath = "github.com/sylabs/singularity";
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 4e4162368b91..27cb8312ea0a 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -5,10 +5,23 @@
, deepClone ? false, private ? false, forceFetchGit ? false
, sparseCheckout ? ""
, githubBase ? "github.com", varPrefix ? null
+, meta ? { }
, ... # For hash agility
}@args:
+
let
+
+ position = (if args.meta.description or null != null
+ then builtins.unsafeGetAttrPos "description" args.meta
+ else builtins.unsafeGetAttrPos "rev" args
+ );
baseUrl = "https://${githubBase}/${owner}/${repo}";
+ newMeta = meta // {
+ homepage = meta.homepage or baseUrl;
+
+ # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
+ position = "${position.file}:${toString position.line}";
+ };
passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ];
varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";
useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != "");
@@ -37,4 +50,4 @@ let
) // privateAttrs // passthruAttrs // { inherit name; };
in
-fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; }
+fetcher fetcherArgs // { meta = newMeta; inherit rev; }
diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix
index 9ed00c8a8f63..8f7df3386d14 100644
--- a/pkgs/build-support/libredirect/default.nix
+++ b/pkgs/build-support/libredirect/default.nix
@@ -57,7 +57,9 @@ else stdenv.mkDerivation rec {
''}
if [ -n "$doInstallCheck" ]; then
- $CC -Wall -std=c99 -O3 test.c -o test
+ $CC -Wall -std=c99 \
+ ${lib.optionalString (!stdenv.isDarwin) "-D_GNU_SOURCE"} \
+ -O3 test.c -o test
fi
runHook postBuild
@@ -97,7 +99,7 @@ else stdenv.mkDerivation rec {
installCheckPhase = ''
(
source "$hook/nix-support/setup-hook"
- NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true" ./test
+ NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test
)
'';
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index 0dc7feb382c3..1222d2ee75c6 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -84,6 +84,13 @@ static const char * rewrite(const char * path, char * buf)
return path;
}
+static char * rewrite_non_const(char * path, char * buf)
+{
+ // as long as the argument `path` is non-const, we can consider discarding
+ // the const qualifier of the return value to be safe.
+ return (char *)rewrite(path, buf);
+}
+
static int open_needs_mode(int flags)
{
#ifdef O_TMPFILE
@@ -354,3 +361,117 @@ WRAPPER(int, mkdirat)(int dirfd, const char *path, mode_t mode)
return mkdirat_real(dirfd, rewrite(path, buf), mode);
}
WRAPPER_DEF(mkdirat)
+
+WRAPPER(int, unlink)(const char *path)
+{
+ int (*unlink_real) (const char *path) = LOOKUP_REAL(unlink);
+ char buf[PATH_MAX];
+ return unlink_real(rewrite(path, buf));
+}
+WRAPPER_DEF(unlink)
+
+WRAPPER(int, unlinkat)(int dirfd, const char *path, int flags)
+{
+ int (*unlinkat_real) (int dirfd, const char *path, int flags) = LOOKUP_REAL(unlinkat);
+ char buf[PATH_MAX];
+ return unlinkat_real(dirfd, rewrite(path, buf), flags);
+}
+WRAPPER_DEF(unlinkat)
+
+WRAPPER(int, rmdir)(const char *path)
+{
+ int (*rmdir_real) (const char *path) = LOOKUP_REAL(rmdir);
+ char buf[PATH_MAX];
+ return rmdir_real(rewrite(path, buf));
+}
+WRAPPER_DEF(rmdir)
+
+static void copy_temp_wildcard(char * dest, char * src, int suffixlen) {
+ int dest_len = strnlen(dest, PATH_MAX);
+ int src_len = strnlen(src, PATH_MAX);
+ memcpy(dest + dest_len - (6 + suffixlen), src + src_len - (6 + suffixlen), 6);
+}
+
+WRAPPER(int, mkstemp)(char *template)
+{
+ int (*mkstemp_real) (char *template) = LOOKUP_REAL(mkstemp);
+ char buf[PATH_MAX];
+ char * rewritten = rewrite_non_const(template, buf);
+ int retval = mkstemp_real(rewritten);
+ if (retval >= 0 && rewritten != template) {
+ copy_temp_wildcard(template, rewritten, 0);
+ }
+ return retval;
+}
+WRAPPER_DEF(mkstemp)
+
+WRAPPER(int, mkostemp)(char *template, int flags)
+{
+ int (*mkostemp_real) (char *template, int flags) = LOOKUP_REAL(mkostemp);
+ char buf[PATH_MAX];
+ char * rewritten = rewrite_non_const(template, buf);
+ int retval = mkostemp_real(rewritten, flags);
+ if (retval >= 0 && rewritten != template) {
+ copy_temp_wildcard(template, rewritten, 0);
+ }
+ return retval;
+}
+WRAPPER_DEF(mkostemp)
+
+WRAPPER(int, mkstemps)(char *template, int suffixlen)
+{
+ int (*mkstemps_real) (char *template, int suffixlen) = LOOKUP_REAL(mkstemps);
+ char buf[PATH_MAX];
+ char * rewritten = rewrite_non_const(template, buf);
+ int retval = mkstemps_real(rewritten, suffixlen);
+ if (retval >= 0 && rewritten != template) {
+ copy_temp_wildcard(template, rewritten, suffixlen);
+ }
+ return retval;
+}
+WRAPPER_DEF(mkstemps)
+
+WRAPPER(int, mkostemps)(char *template, int suffixlen, int flags)
+{
+ int (*mkostemps_real) (char *template, int suffixlen, int flags) = LOOKUP_REAL(mkostemps);
+ char buf[PATH_MAX];
+ char * rewritten = rewrite_non_const(template, buf);
+ int retval = mkostemps_real(rewritten, suffixlen, flags);
+ if (retval >= 0 && rewritten != template) {
+ copy_temp_wildcard(template, rewritten, suffixlen);
+ }
+ return retval;
+}
+WRAPPER_DEF(mkostemps)
+
+WRAPPER(char *, mkdtemp)(char *template)
+{
+ char * (*mkdtemp_real) (char *template) = LOOKUP_REAL(mkdtemp);
+ char buf[PATH_MAX];
+ char * rewritten = rewrite_non_const(template, buf);
+ char * retval = mkdtemp_real(rewritten);
+ if (retval == NULL) {
+ return retval;
+ };
+ if (rewritten != template) {
+ copy_temp_wildcard(template, rewritten, 0);
+ }
+ return template;
+}
+WRAPPER_DEF(mkdtemp)
+
+WRAPPER(char *, mktemp)(char *template)
+{
+ char * (*mktemp_real) (char *template) = LOOKUP_REAL(mktemp);
+ char buf[PATH_MAX];
+ char * rewritten = rewrite_non_const(template, buf);
+ char * retval = mktemp_real(rewritten);
+ if (retval == NULL) {
+ return retval;
+ };
+ if (rewritten != template) {
+ copy_temp_wildcard(template, rewritten, 0);
+ }
+ return template;
+}
+WRAPPER_DEF(mktemp)
diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c
index 853f26bb5209..144e6d3d66dd 100644
--- a/pkgs/build-support/libredirect/test.c
+++ b/pkgs/build-support/libredirect/test.c
@@ -1,14 +1,18 @@
#include
+#include
#include
+#include
#include
#include
#include
+#include
#include
#include
#include
#include
+#define TESTDIR "/bar/baz"
#define TESTPATH "/foo/bar/test"
#define SUBTEST "./test sub"
@@ -41,11 +45,25 @@ void test_subprocess(void) {
assert(system(SUBTEST) == 0);
}
+void assert_mktemp_path(
+ const char * orig_prefix,
+ const char * orig_suffix,
+ const char * updated
+) {
+ // prefix unchanged
+ assert(strncmp(updated, orig_prefix, strlen(orig_prefix)) == 0);
+ // wildcards replaced
+ assert(strcmp(updated + strlen(orig_prefix), "XXXXXX") != 0);
+ // suffix unchanged
+ assert(strcmp(updated + strlen(orig_prefix) + 6, orig_suffix) == 0);
+}
+
int main(int argc, char *argv[])
{
FILE *testfp;
int testfd;
struct stat testsb;
+ char buf[PATH_MAX];
testfp = fopen(TESTPATH, "r");
assert(testfp != NULL);
@@ -59,6 +77,54 @@ int main(int argc, char *argv[])
assert(stat(TESTPATH, &testsb) != -1);
+ assert(mkdir(TESTDIR "/dir-mkdir", 0777) == 0);
+ assert(unlink(TESTDIR "/dir-mkdir") == -1); // it's a directory!
+#ifndef __APPLE__
+ assert(errno == EISDIR);
+#endif
+ assert(rmdir(TESTDIR "/dir-mkdir") == 0);
+ assert(unlink(TESTDIR "/dir-mkdir") == -1);
+ assert(errno == ENOENT);
+
+ assert(mkdirat(123, TESTDIR "/dir-mkdirat", 0777) == 0);
+ assert(unlinkat(123, TESTDIR "/dir-mkdirat", 0) == -1); // it's a directory!
+#ifndef __APPLE__
+ assert(errno == EISDIR);
+#endif
+ assert(unlinkat(123, TESTDIR "/dir-mkdirat", AT_REMOVEDIR) == 0);
+
+ strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX);
+ testfd = mkstemp(buf);
+ assert(testfd > 0);
+ assert_mktemp_path(TESTDIR "/temp", "", buf);
+ close(testfd);
+
+ strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX);
+ testfd = mkostemp(buf, 0);
+ assert(testfd > 0);
+ assert_mktemp_path(TESTDIR "/temp", "", buf);
+ close(testfd);
+
+ strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX);
+ testfd = mkstemps(buf, strlen(".test"));
+ assert(testfd > 0);
+ assert_mktemp_path(TESTDIR "/temp", ".test", buf);
+ close(testfd);
+
+ strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX);
+ testfd = mkostemps(buf, strlen(".test"), 0);
+ assert(testfd > 0);
+ assert_mktemp_path(TESTDIR "/temp", ".test", buf);
+ close(testfd);
+
+ strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX);
+ assert(mkdtemp(buf) == buf);
+ assert_mktemp_path(TESTDIR "/temp", "", buf);
+
+ strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX);
+ assert(mktemp(buf) == buf);
+ assert_mktemp_path(TESTDIR "/temp", "", buf);
+
test_spawn();
test_system();
diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/build-support/make-darwin-bundle/default.nix
new file mode 100644
index 000000000000..b8f58882fff3
--- /dev/null
+++ b/pkgs/build-support/make-darwin-bundle/default.nix
@@ -0,0 +1,26 @@
+# given a package with an executable and an icon, make a darwin bundle for
+# it. This package should be used when generating launchers for native Darwin
+# applications. If the package conatins a .desktop file use
+# `desktopToDarwinLauncher` instead.
+
+{ lib, writeShellScript, writeDarwinBundle }:
+
+{ name # The name of the Application file.
+, exec # Executable file.
+, icon ? "" # Optional icon file.
+}:
+
+writeShellScript "make-darwin-bundle-${name}" (''
+ function makeDarwinBundlePhase() {
+ mkdir -p "$out/Applications/${name}.app/Contents/MacOS"
+ mkdir -p "$out/Applications/${name}.app/Contents/Resources"
+
+ if [ -n "${icon}" ]; then
+ ln -s "${icon}" "$out/Applications/${name}.app/Contents/Resources"
+ fi
+
+ ${writeDarwinBundle}/bin/write-darwin-bundle "$out" "${name}" "${exec}"
+ }
+
+ preDistPhases+=" makeDarwinBundlePhase"
+'')
diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix
new file mode 100644
index 000000000000..63ef7e655075
--- /dev/null
+++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix
@@ -0,0 +1,40 @@
+{ writeScriptBin, lib, ... }:
+
+let
+ pListText = lib.generators.toPlist { } {
+ CFBundleDevelopmentRegion = "English";
+ CFBundleExecutable = "$name";
+ CFBundleIconFiles = [ "$iconPlistArray" ];
+ CFBundleIdentifier = "org.nixos.$name";
+ CFBundleInfoDictionaryVersion = "6.0";
+ CFBundleName = "$name";
+ CFBundlePackageType = "APPL";
+ CFBundleSignature = "???";
+ };
+
+# The generation of the CFBundleIconFiles array is a bit of a hack, since we
+# will always end up with an empty first element () but macOS
+# appears to ignore this which allows us to use the nix PList generator.
+in writeScriptBin "write-darwin-bundle" ''
+ shopt -s nullglob
+
+ readonly prefix="$1"
+ readonly name="$2"
+ readonly exec="$3"
+ iconPlistArray=""
+
+ for icon in "$prefix/Applications/$name.app/Contents/Resources"/*; do
+ iconPlistArray="$iconPlistArray"$(basename "$icon")""
+ done
+
+ cat > "$prefix/Applications/$name.app/Contents/Info.plist" < "$prefix/Applications/$name.app/Contents/MacOS/$name" </dev/null);
+ local -r pixMaps=$(find "$out/share/pixmaps/" -name "${iconName}.xpm" 2>/dev/null);
+
+ mkdir -p "$out/Applications/${name}.app/Contents/MacOS"
+ mkdir -p "$out/Applications/${name}.app/Contents/Resources"
+
+ local i=0;
+ for icon in $iconFiles; do
+ ln -s "$icon" "$out/Applications/${name}.app/Contents/Resources/$i-$(basename "$icon")"
+ (( i +=1 ));
+ done
+
+ for pixmap in $pixMaps; do
+ local newIconName="$i-$(basename "$pixmap")";
+ convert "$pixmap" "$out/Applications/${name}.app/Contents/Resources/${newIconName%.xpm}.png"
+ (( i +=1 ));
+ done
+
+ write-darwin-bundle "$out" "$name" "$exec"
+}
+
+convertDesktopFiles() {
+ local dir="$1/share/applications/"
+
+ if [ -d "${dir}" ]; then
+ for desktopFile in $(find "$dir" -iname "*.desktop"); do
+ convertDesktopFile "$desktopFile";
+ done
+ fi
+}
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 903e17c3b2e5..604096135c20 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -36,6 +36,58 @@ makeWrapper() {
assertExecutable "$original"
+ # Write wrapper code which adds `value` to the beginning or end of
+ # the list variable named by `varName`, depending on the `mode`
+ # specified.
+ #
+ # A value which is already part of the list will not be added
+ # again. If this is the case and the `suffix` mode is used, the
+ # list won't be touched at all. The `prefix` mode will however
+ # move the last matching instance of the value to the beginning
+ # of the list. Any remaining duplicates of the value will be left
+ # as-is.
+ addValue() {
+ local mode="$1" # `prefix` or `suffix` to add to the beginning or end respectively
+ local varName="$2" # name of list variable to add to
+ local separator="$3" # character used to separate elements of list
+ local value="$4" # one value, or multiple values separated by `separator`, to add to list
+ if test -n "$value"; then
+ local old_ifs=$IFS
+ IFS=$separator
+
+ if [[ "$mode" == '--prefix'* ]]; then
+ # Keep the order of the components as written when
+ # prefixing; normally, they would be added in the
+ # reverse order.
+ local tmp=
+ for v in $value; do
+ tmp=$v${tmp:+$separator}$tmp
+ done
+ value="$tmp"
+ fi
+ for v in $value; do
+ {
+ echo "$varName=\${$varName:+${separator@Q}\$$varName${separator@Q}}" # add separators on both ends unless empty
+ if [[ "$mode" == '--prefix'* ]]; then # -- in prefix mode --
+ echo "$varName=\${$varName/${separator@Q}${v@Q}${separator@Q}/${separator@Q}}" # remove the first instance of the value (if any)
+ echo "$varName=${v@Q}\$$varName" # prepend the value
+ elif [[ "$mode" == '--suffix'* ]]; then # -- in suffix mode --
+ echo "if [[ \$$varName != *${separator@Q}${v@Q}${separator@Q}* ]]; then" # if the value isn't already in the list
+ echo " $varName=\$$varName${v@Q}" # append the value
+ echo "fi"
+ else
+ echo "unknown mode $mode!" 1>&2
+ exit 1
+ fi
+ echo "$varName=\${$varName#${separator@Q}}" # remove leading separator
+ echo "$varName=\${$varName%${separator@Q}}" # remove trailing separator
+ echo "export $varName"
+ } >> "$wrapper"
+ done
+ IFS=$old_ifs
+ fi
+ }
+
mkdir -p "$(dirname "$wrapper")"
echo "#! @shell@ -e" > "$wrapper"
@@ -67,28 +119,14 @@ makeWrapper() {
separator="${params[$((n + 2))]}"
value="${params[$((n + 3))]}"
n=$((n + 3))
- if test -n "$value"; then
- if test "$p" = "--suffix"; then
- echo "export $varName=\$$varName\${$varName:+${separator@Q}}${value@Q}" >> "$wrapper"
- else
- echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper"
- fi
- fi
- elif [[ "$p" == "--prefix-each" ]]; then
+ addValue "$p" "$varName" "$separator" "$value"
+ elif [[ ("$p" == "--suffix-each") || ("$p" == "--prefix-each") ]]; then
varName="${params[$((n + 1))]}"
separator="${params[$((n + 2))]}"
values="${params[$((n + 3))]}"
n=$((n + 3))
for value in $values; do
- echo "export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName" >> "$wrapper"
- done
- elif [[ "$p" == "--suffix-each" ]]; then
- varName="${params[$((n + 1))]}"
- separator="${params[$((n + 2))]}"
- values="${params[$((n + 3))]}"
- n=$((n + 3))
- for value in $values; do
- echo "export $varName=\$$varName\${$varName:+$separator}${value@Q}" >> "$wrapper"
+ addValue "$p" "$varName" "$separator" "$value"
done
elif [[ ("$p" == "--suffix-contents") || ("$p" == "--prefix-contents") ]]; then
varName="${params[$((n + 1))]}"
@@ -97,11 +135,7 @@ makeWrapper() {
n=$((n + 3))
for fileName in $fileNames; do
contents="$(cat "$fileName")"
- if test "$p" = "--suffix-contents"; then
- echo "export $varName=\$$varName\${$varName:+$separator}${contents@Q}" >> "$wrapper"
- else
- echo "export $varName=${contents@Q}\${$varName:+$separator}\$$varName" >> "$wrapper"
- fi
+ addValue "$p" "$varName" "$separator" "$contents"
done
elif [[ "$p" == "--add-flags" ]]; then
flags="${params[$((n + 1))]}"
diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix
index a1f8f316773e..136a3218761c 100644
--- a/pkgs/data/fonts/julia-mono/default.nix
+++ b/pkgs/data/fonts/julia-mono/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "0.043";
+ version = "0.044";
in
fetchzip {
name = "JuliaMono-ttf-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
- sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE=";
+ sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg=";
postFetch = ''
mkdir -p $out/share/fonts/truetype
diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix
deleted file mode 100644
index 77b67e48f923..000000000000
--- a/pkgs/data/misc/mime-types/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, fetchzip }:
-
-let
- version = "9";
-in fetchzip rec {
- name = "mime-types-${version}";
- url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2";
- postFetch = ''
- mkdir -p $out/etc
- tar xjvf $downloadedFile --directory=$out/etc --strip-components=1
- '';
- sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0";
-
- meta = with lib; {
- description = "A database of common mappings of file extensions to MIME types";
- homepage = "https://packages.gentoo.org/packages/app-misc/mime-types";
- license = licenses.gpl2;
- maintainers = with maintainers; [ peterhoeg ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix
deleted file mode 100644
index 0d1f8df4f275..000000000000
--- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, glib, gettext }:
-
-stdenv.mkDerivation rec {
- pname = "gnome-shell-extension-dash-to-panel";
- version = "45";
-
- src = fetchFromGitHub {
- owner = "home-sweet-gnome";
- repo = "dash-to-panel";
- rev = "v${version}";
- sha256 = "05bfd3b1g9zd86pl1rpgfqsmip271lasyfj8phpqf1gdds5yz6f6";
- };
-
- buildInputs = [
- glib gettext
- ];
-
- makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
-
- passthru = {
- extensionUuid = "dash-to-panel@jderose9.github.com";
- extensionPortalSlug = "dash-to-panel";
- };
-
- meta = with lib; {
- description = "An icon taskbar for Gnome Shell";
- license = licenses.gpl2;
- maintainers = with maintainers; [ mounium ];
- homepage = "https://github.com/jderose9/dash-to-panel";
- };
-}
diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
index a08af5734e47..28d0f32777a8 100644
--- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
+++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix
@@ -2,7 +2,6 @@
{
"arcmenu@arcmenu.com" = callPackage ./arcmenu { };
"clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { };
- "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { };
"drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { };
"EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { };
"emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { };
diff --git a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch
deleted file mode 100644
index bd519c292c26..000000000000
--- a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001
-From: Bobby Rong
-Date: Sun, 31 Oct 2021 23:12:46 +0800
-Subject: [PATCH] build: add packagekit_backend option
-
----
- .github/workflows/main.yml | 7 +++++++
- meson_options.txt | 1 +
- src/Application.vala | 4 ++++
- src/Core/BackendAggregator.vala | 2 ++
- src/Core/Package.vala | 21 +++++++++++++--------
- src/Core/UpdateManager.vala | 6 ++++++
- src/Views/Homepage.vala | 4 ++++
- src/meson.build | 10 ++++++++--
- 8 files changed, 45 insertions(+), 10 deletions(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index daf13654..5dc5a2fb 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -42,6 +42,13 @@ jobs:
- meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build
- ninja -C build install
-
-+ - name: Build (NixOS)
-+ env:
-+ DESTDIR: out
-+ run: |
-+ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build
-+ ninja -C build install
-+
- lint:
-
- runs-on: ubuntu-latest
-diff --git a/meson_options.txt b/meson_options.txt
-index 0ae93d07..37a6cd8a 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of
- option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps')
- option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io')
- option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS')
-+option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend')
-diff --git a/src/Application.vala b/src/Application.vala
-index 65fae5aa..7c075076 100644
---- a/src/Application.vala
-+++ b/src/Application.vala
-@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application {
-
- var client = AppCenterCore.Client.get_default ();
-
-+#if PACKAGEKIT_BACKEND
- if (fake_update_packages != null) {
- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages;
- }
-+#endif
-
- if (silent) {
- NetworkMonitor.get_default ().network_changed.connect ((available) => {
-@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application {
- return;
- }
-
-+#if PACKAGEKIT_BACKEND
- if (local_path != null) {
- var file = File.new_for_commandline_arg (local_path);
-
-@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application {
- warning ("Failed to load local AppStream XML file: %s", e.message);
- }
- }
-+#endif
-
- if (main_window == null) {
- main_window = new MainWindow (this);
-diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala
-index 539dba98..feb1eaa9 100644
---- a/src/Core/BackendAggregator.vala
-+++ b/src/Core/BackendAggregator.vala
-@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object {
-
- construct {
- backends = new Gee.ArrayList ();
-+#if PACKAGEKIT_BACKEND
- backends.add (PackageKitBackend.get_default ());
- backends.add (UbuntuDriversBackend.get_default ());
-+#endif
- backends.add (FlatpakBackend.get_default ());
-
- unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default ();
-diff --git a/src/Core/Package.vala b/src/Core/Package.vala
-index d6f12f15..8dbd7a22 100644
---- a/src/Core/Package.vala
-+++ b/src/Core/Package.vala
-@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object {
- public string origin_description {
- owned get {
- unowned string origin = component.get_origin ();
-- if (backend is PackageKitBackend) {
-+ if (backend is FlatpakBackend) {
-+ var fp_package = this as FlatpakPackage;
-+ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) {
-+ return _("%s (system-wide)").printf (origin);
-+ }
-+ return origin;
-+#if PACKAGEKIT_BACKEND
-+ } else if (backend is PackageKitBackend) {
- if (origin == APPCENTER_PACKAGE_ORIGIN) {
- return _("AppCenter");
- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
-@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object {
- } else if (origin.has_prefix ("ubuntu-")) {
- return _("Ubuntu (non-curated)");
- }
-- } else if (backend is FlatpakBackend) {
-- var fp_package = this as FlatpakPackage;
-- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) {
-- return _("%s (system-wide)").printf (origin);
-- }
--
-- return origin;
- } else if (backend is UbuntuDriversBackend) {
- return _("Ubuntu Drivers");
-+#endif
- }
-
- return _("Unknown Origin (non-curated)");
-@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object {
- _author_title = null;
- backend_details = null;
-
-+#if PACKAGEKIT_BACKEND
- // The version on a PackageKit package comes from the package not AppStream, so only reset the version
- // on other backends
- if (!(backend is PackageKitBackend)) {
- _latest_version = null;
- }
-+#else
-+ _latest_version = null;
-+#endif
-
- this.component = component;
- }
-diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala
-index 9deceaf5..c92c0d37 100644
---- a/src/Core/UpdateManager.vala
-+++ b/src/Core/UpdateManager.vala
-@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object {
- installed_package.update_state ();
- }
-
-+#if PACKAGEKIT_BACKEND
- Pk.Results pk_updates;
- unowned PackageKitBackend client = PackageKitBackend.get_default ();
- try {
-@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object {
- warning ("Unable to get updates from PackageKit backend: %s", e.message);
- return 0;
- }
-+#endif
-
- uint os_count = 0;
- string os_desc = "";
-
-+#if PACKAGEKIT_BACKEND
- var package_array = pk_updates.get_package_array ();
- debug ("PackageKit backend reports %d updates", package_array.length);
-
-@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object {
- );
- }
- });
-+#endif
-
- os_updates.component.set_pkgnames ({});
- os_updates.change_information.clear_update_info ();
-@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object {
- count += 1;
- }
-
-+#if PACKAGEKIT_BACKEND
- pk_updates.get_details_array ().foreach ((pk_detail) => {
- var pk_package = new Pk.Package ();
- try {
-@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object {
- critical (e.message);
- }
- });
-+#endif
-
- os_updates.update_state ();
- return count;
-diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala
-index 3673903f..2e128e77 100644
---- a/src/Views/Homepage.vala
-+++ b/src/Views/Homepage.vala
-@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView {
- column_spacing = 24,
- orientation = Gtk.Orientation.VERTICAL
- };
-+#if PACKAGEKIT_BACKEND
- grid.add (banner_revealer);
- grid.add (recently_updated_revealer);
- grid.add (categories_label);
-+#else
-+ category_flow.margin_top = 12;
-+#endif
- grid.add (category_flow);
-
- scrolled_window = new Gtk.ScrolledWindow (null, null) {
-diff --git a/src/meson.build b/src/meson.build
-index 7b319fc6..d1d77931 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -12,10 +12,8 @@ appcenter_files = files(
- 'Core/FlatpakBackend.vala',
- 'Core/Job.vala',
- 'Core/Package.vala',
-- 'Core/PackageKitBackend.vala',
- 'Core/ScreenshotCache.vala',
- 'Core/Task.vala',
-- 'Core/UbuntuDriversBackend.vala',
- 'Core/UpdateManager.vala',
- 'Dialogs/InstallFailDialog.vala',
- 'Dialogs/NonCuratedWarningDialog.vala',
-@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps')
- args += '--define=HIDE_UPSTREAM_DISTRO_APPS'
- endif
-
-+if get_option('packagekit_backend')
-+ args += '--define=PACKAGEKIT_BACKEND'
-+ appcenter_files += files(
-+ 'Core/PackageKitBackend.vala',
-+ 'Core/UbuntuDriversBackend.vala',
-+ )
-+endif
-+
- executable(
- meson.project_name(),
- appcenter_files,
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index c0c1513e784f..d62141ece2bd 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0=";
};
- patches = [
- # Introduces a packagekit_backend meson flag.
- # Makes appcenter actually work by using only the flatpak backend.
- # https://github.com/elementary/appcenter/pull/1739
- ./add-packagekit-backend-option.patch
- ];
-
nativeBuildInputs = [
appstream-glib
dbus # for pkg-config
@@ -77,8 +70,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dpayments=false"
"-Dcurated=false"
- # This option is introduced in add-packagekit-backend-option.patch
- "-Dpackagekit_backend=false"
];
postPatch = ''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 393186325baf..a42ae92e97af 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -47,8 +47,7 @@ stdenv.mkDerivation rec {
'';
preInstall = ''
- # Install our override for plank dockitems as Appcenter is not ready to be preinstalled.
- # See: https://github.com/NixOS/nixpkgs/issues/70214.
+ # Install our override for plank dockitems as the desktop file path is different.
schema_dir=$out/share/glib-2.0/schemas
install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem
new file mode 100644
index 000000000000..586a74df2447
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///run/current-system/sw/share/applications/io.elementary.appcenter.desktop
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
index 426368e8473b..0ba89fa4b40b 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override
@@ -1,2 +1,2 @@
[net.launchpad.plank.dock.settings]
-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem']
+dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem']
diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix
index f8e6f423bdae..c7bfa49ac719 100644
--- a/pkgs/development/beam-modules/erlang-ls/default.nix
+++ b/pkgs/development/beam-modules/erlang-ls/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
, stdenv, writeScript, lib }:
let
- version = "0.21.2";
+ version = "0.22.0";
owner = "erlang-ls";
repo = "erlang_ls";
deps = import ./rebar-deps.nix {
@@ -19,7 +19,7 @@ rebar3Relx {
inherit version;
src = fetchFromGitHub {
inherit owner repo;
- sha256 = "sha256-CiA71mvmq3HrJvgrEDMwp3CQ4Dl05BpTO5HusAL5FAQ=";
+ sha256 = "sha256-s5gCqQ0gJViS8t/jCAFtNYfmXQ7SBarlRLKUWHHEgSg=";
rev = version;
};
releaseType = "escript";
diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
index 2bc8b18a003b..9d1fa9aef067 100644
--- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
+++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
@@ -137,11 +137,12 @@ let
};
erlfmt = builder {
name = "erlfmt";
- version = "1.0.0";
- src = fetchHex {
- pkg = "erlfmt";
- version = "1.0.0";
- sha256 = "sha256-RL4L4DzmmQLcbc2PZeezre1qr10L5wlkGIyr1K0k8E4=";
+ version = "git";
+ src = fetchFromGitHub {
+ owner = "gomoripeti";
+ repo = "erlfmt";
+ rev = "d4422d1fd79a73ef534c2bcbe5b5da4da5338833";
+ sha256 = "07jp4g6a41w7318lh8ndsvgivkj0ahz3spnrsnx4cqkdb97yjaid";
};
beamDeps = [ ];
};
@@ -157,11 +158,11 @@ let
};
elvis_core = builder {
name = "elvis_core";
- version = "1.1.1";
+ version = "1.3.1";
src = fetchHex {
pkg = "elvis_core";
- version = "1.1.1";
- sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI=";
+ version = "1.3.1";
+ sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk=";
};
beamDeps = [ katana_code zipper ];
};
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index e977d2b00203..ff243372b4a5 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake
-, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby
+, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4, python2, ruby
, openjdk11-bootstrap }:
let
@@ -19,7 +19,7 @@ let
sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
};
- buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index 26c16895c5d4..3feda519b084 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
-, ffmpeg, python3, ruby }:
+, ffmpeg_4, python3, ruby }:
let
major = "15";
@@ -21,7 +21,7 @@ let
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
};
- buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/rust/1_57.nix b/pkgs/development/compilers/rust/1_58.nix
similarity index 58%
rename from pkgs/development/compilers/rust/1_57.nix
rename to pkgs/development/compilers/rust/1_58.nix
index f6b9d3c72a32..c854bfdd37a4 100644
--- a/pkgs/development/compilers/rust/1_57.nix
+++ b/pkgs/development/compilers/rust/1_58.nix
@@ -20,8 +20,8 @@
} @ args:
import ./default.nix {
- rustcVersion = "1.57.0";
- rustcSha256 = "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim";
+ rustcVersion = "1.58.1";
+ rustcSha256 = "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8";
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
@@ -37,24 +37,24 @@ import ./default.nix {
# Note: the version MUST be one version prior to the version we're
# building
- bootstrapVersion = "1.56.1";
+ bootstrapVersion = "1.57.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
- i686-unknown-linux-gnu = "84db34603ce22d93312ff8bccd5580fe112e932bbeb0361e7cc37668a9803a27";
- x86_64-unknown-linux-gnu = "a6be5d045183a0b12dddf0d81633e2a64e63e4c2dfa44eb7593970c1ef93a98f";
- x86_64-unknown-linux-musl = "3c09058d104d9a88943fb343af1fb70422f9c4a987e6703666ee8a8051211190";
- arm-unknown-linux-gnueabihf = "c445706d109bb74de4c889687ae08a48af5808676fda15b84b7ef5970a82a5f6";
- armv7-unknown-linux-gnueabihf = "29ec65af502370c0c1a49faecd7131f1243fe3005b419ead4b40b267af2b2db0";
- aarch64-unknown-linux-gnu = "69792887357c8dd78c5424f0b4a624578296796d99edf6c30ebe2acc2b939aa3";
- aarch64-unknown-linux-musl = "971d13d41657e50e3ac54f17f52b4198c3d8bc25ec489a6a9e6d12c18226dda5";
- x86_64-apple-darwin = "8d65ef02a123c23be00101fb204d28b60498b9145dd2ee8edabf0afde6e01e55";
- aarch64-apple-darwin = "e71c14c1368048a22e4d1851f301872ac2e6f4c574f04d2a7ae4d64b0e7c7235";
- powerpc64le-unknown-linux-gnu = "fa78b28fe1ef3cd4add9ec151e5eab756dfc83c8bc3e5a576a6eddd350c4de7a";
- riscv64gc-unknown-linux-gnu = "5ec327d1bd3ba8d00afbe9be4a1f0fb8ab845063fcf9be479be9493c52a4dbb6";
+ i686-unknown-linux-gnu = "7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa";
+ x86_64-unknown-linux-gnu = "ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda";
+ x86_64-unknown-linux-musl = "56876ebca0e46236208c8bd3c3425dba553abe49639e1040ee8b95bc66a45d33";
+ arm-unknown-linux-gnueabihf = "b4448f7a96da4feee99a2c4b16b5738b99ab7e86e22d284ea6f7dca5921bca9b";
+ armv7-unknown-linux-gnueabihf = "577682b1405e8901f971839407daaad06d8ae68ad370305b75d569ba293c4fb4";
+ aarch64-unknown-linux-gnu = "d66847f7cf7b548ecb328c400ac4f691ee2aea6ff5cd9286ad8733239569556c";
+ aarch64-unknown-linux-musl = "91c8e5171e5715261f7f635142a10a9415a4e5ba55374daf76f0b713c8b08132";
+ x86_64-apple-darwin = "15ceffc4743434c19d08f73fb4edd6642b7fd8162ed7101d3e6ca2c691fcb699";
+ aarch64-apple-darwin = "7511075e28b715e2d9c7ee74221779f8444681a4bb60ac3a0270a5fdf08bdd5a";
+ powerpc64le-unknown-linux-gnu = "3ddc1abed6b7535c4150bf54291901fa856806c948bc21b711e24a3c8d810be7";
+ riscv64gc-unknown-linux-gnu = "f809df1c6ac0adc9bd37eb871dfb0d9809f3ed7f61ba611f9305e9eb8f8c9226";
};
- selectRustPackage = pkgs: pkgs.rust_1_57;
+ selectRustPackage = pkgs: pkgs.rust_1_58;
rustcPatches = [
];
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index 93755e83a3d6..51314db3f9fc 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
- version = "0.7.3";
+ version = "0.7.4";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
- sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU=";
+ sha256 = "sha256-GphF32CFxZYaoTG1k9pP+cRNs/PIKtwevTcIyjG7CpQ=";
};
executable = "bb";
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 45dc35681c38..e2ab96d41b3f 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
- version = "1.10.3.1058";
+ version = "1.10.3.1075";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
- sha256 = "guIQjiWyulITZZSjt/kCtU5qo4FG/2IK2rwBI6Ttfe0=";
+ sha256 = "5uJtr6uz6mrkoFfzUmUb6vy5H4s1Lag3CNCsGwsQZ9Q=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/development/interpreters/nextflow/default.nix
new file mode 100644
index 000000000000..c182214ccbb0
--- /dev/null
+++ b/pkgs/development/interpreters/nextflow/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, stdenv
+, fetchurl
+, makeWrapper
+, jre
+, wget
+, which
+, gnused
+, gawk
+, coreutils
+}:
+
+stdenv.mkDerivation rec {
+ pname = "nextflow";
+ version = "21.10.6";
+
+ src = fetchurl {
+ url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all";
+ sha256 = "0l9hi51vrhvfx3px2pxw7lp4h21n8ks50x4icfk3hbgl2hwf7fvx";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ jre wget which gnused gawk coreutils ];
+
+ dontUnpack = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ install -Dm755 $src $out/bin/nextflow
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/nextflow --prefix PATH : ${lib.makeBinPath buildInputs}
+ '';
+
+ meta = with lib; {
+ description = "A DSL for data-driven computational pipelines";
+ longDescription = ''
+ Nextflow is a bioinformatics workflow manager that enables the development of portable and reproducible workflows.
+
+ It supports deploying workflows on a variety of execution platforms including local, HPC schedulers, AWS Batch, Google Cloud Life Sciences, and Kubernetes.
+
+ Additionally, it provides support for manage your workflow dependencies through built-in support for Conda, Docker, Singularity, and Modules.
+ '';
+ homepage = "https://www.nextflow.io/";
+ changelog = "https://github.com/nextflow-io/nextflow/releases";
+ license = licenses.asl20;
+ maintainers = [ maintainers.Etjean ];
+ mainProgram = "nextflow";
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 7a2a79b8cfed..1bcbd2bb4b5e 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -4,7 +4,7 @@
, libffi
, gdbm
, xz
-, mime-types ? null, mimetypesSupport ? true
+, mailcap, mimetypesSupport ? true
, ncurses
, openssl
, readline
@@ -17,6 +17,7 @@
, configd
, autoreconfHook
, autoconf-archive
+, pkg-config
, python-setup-hook
, nukeReferences
# For the Python package set
@@ -62,8 +63,6 @@ assert x11Support -> tcl != null
assert bluezSupport -> bluez != null;
-assert mimetypesSupport -> mime-types != null;
-
assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
"Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
@@ -105,7 +104,7 @@ let
nativeBuildInputs = optionals (!stdenv.isDarwin) [
autoreconfHook
- ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [
+ pkg-config
autoconf-archive # needed for AX_CHECK_COMPILE_FLAG
] ++ [
nukeReferences
@@ -277,7 +276,7 @@ in with passthru; stdenv.mkDerivation {
--replace "'/bin/sh'" "'${bash}/bin/sh'"
'' + optionalString mimetypesSupport ''
substituteInPlace Lib/mimetypes.py \
- --replace "@mime-types@" "${mime-types}"
+ --replace "@mime-types@" "${mailcap}"
'' + optionalString (x11Support && (tix != null)) ''
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 5cdba9d3204b..6bee51f64232 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -133,10 +133,19 @@ with pkgs;
sourceVersion = {
major = "3";
minor = "9";
- patch = "9";
+ patch = "10";
suffix = "";
};
- sha256 = "sha256-BoKMBKVzwHOk5RxCkqJ8G+SuJmIcPtx8+TGEGM47bSc=";
+ sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg=";
+ };
+ python310 = {
+ sourceVersion = {
+ major = "3";
+ minor = "10";
+ patch = "2";
+ suffix = "";
+ };
+ sha256 = "sha256-F946x9qfJRmqnWQ3jGA6c6DprVjf+ogS5FFgwIbeZMc=";
};
};
@@ -180,18 +189,11 @@ in {
inherit passthruFun;
} // sources.python39);
- python310 = callPackage ./cpython {
+ python310 = callPackage ./cpython ({
self = python310;
- sourceVersion = {
- major = "3";
- minor = "10";
- patch = "1";
- suffix = "";
- };
- sha256 = "0xz1wrd6xi20sbli30vm6jclc4rlnnd03irybknf2p8sdrdjdwd7";
inherit (darwin) configd;
inherit passthruFun;
- };
+ } // sources.python310);
python311 = callPackage ./cpython {
self = python311;
@@ -199,9 +201,9 @@ in {
major = "3";
minor = "11";
patch = "0";
- suffix = "a2";
+ suffix = "a4";
};
- sha256 = "sha256-aKjE1s4lSKe2F9aZ+9s0iTe9rODPltsaoIOEnfXa0T8=";
+ sha256 = "sha256-Q3/nN2w2Pa+vNM6A8ERrQfyaQsDiqMflGdPwoLfPs+0=";
inherit (darwin) configd;
inherit passthruFun;
};
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 8a20fa92857e..c676a7b05e55 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -166,6 +166,8 @@ let
# Bundler tries to create this directory
postInstall = ''
rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+ # Remove references to the build environment from the closure
+ sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $rbConfig
${
@@ -203,7 +205,6 @@ let
# Add rbconfig shim so ri can find docs
mkdir -p $devdoc/lib/ruby/site_ruby
cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb
- sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig
'' + opString useBaseRuby ''
# Prevent the baseruby from being included in the closure.
${removeReferencesTo}/bin/remove-references-to \
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/202103.nix
similarity index 94%
rename from pkgs/development/libraries/abseil-cpp/default.nix
rename to pkgs/development/libraries/abseil-cpp/202103.nix
index 2ade512de310..d2a1f389324c 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/202103.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "abseil";
repo = "abseil-cpp";
rev = version;
- sha256 = "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x";
+ sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0=";
};
patches = [
diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix
new file mode 100644
index 000000000000..d40ca0bd4ab2
--- /dev/null
+++ b/pkgs/development/libraries/abseil-cpp/202111.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, static ? stdenv.hostPlatform.isStatic
+, cxxStandard ? null
+}:
+
+stdenv.mkDerivation rec {
+ pname = "abseil-cpp";
+ version = "20211102.0";
+
+ src = fetchFromGitHub {
+ owner = "abseil";
+ repo = "abseil-cpp";
+ rev = version;
+ sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk=";
+ };
+
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+ ] ++ lib.optionals (cxxStandard != null) [
+ "-DCMAKE_CXX_STANDARD=${cxxStandard}"
+ ];
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with lib; {
+ description = "An open-source collection of C++ code designed to augment the C++ standard library";
+ homepage = "https://abseil.io/";
+ license = licenses.asl20;
+ platforms = platforms.all;
+ maintainers = [ maintainers.andersk ];
+ };
+}
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index df390ec1668d..9616c13cc40c 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
- version = "7.0.5";
+ version = "7.0.6";
src = fetchurl {
url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "sha256-Q4v0HhhKUmLit5+V7bb9g4T7fqaeJJxU512vBZqNl1c=";
+ sha256 = "sha256-SgzX2khR92n9388z9mPrpK+tgk7+/59Z8TTEZA7oAhY=";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index e47dcd8e0ba2..dc160c37ad23 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "arb";
- version = "2.21.1";
+ version = "2.22.1";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = pname;
rev = version;
- sha256 = "sha256-OBY2gKVnvrZLVrv+d6rXQLo026mrGB9eyNV4LESgrNI=";
+ sha256 = "sha256-Xd3dy7zr4i3pULLFOYtedpS5Yj9Ljwyu6r4kfhRynmE=";
};
buildInputs = [ mpir gmp mpfr flint ];
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
"--with-flint=${flint}"
];
+ enableParallelBuilding = true;
+
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index b20bdac90876..d5057a614843 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ];
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
- preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
- export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
- '';
-
# boehm-gc whitelists GCC threading models
patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 5adcc2d1dd9e..71a99ad6b696 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
- version = "2.13.7";
+ version = "2.13.8";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
- sha256="sha256-NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI=";
+ sha256="sha256-jOA2TxDgaJUJ2Jn7dVGZUbjmphTDuVZahzSaxfJpRqE=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index c8b8875154a8..5b8cc369ee31 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, darwin, zlib }:
+{ lib, stdenv, fetchurl, cmake, boost, ffmpeg_4, darwin, zlib }:
stdenv.mkDerivation rec {
pname = "chromaprint";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost ffmpeg ] ++ lib.optionals stdenv.isDarwin
+ buildInputs = [ boost ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]);
cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index d44783079f0f..322c6ecebbf6 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "expat";
- version = "2.4.2";
+ version = "2.4.4";
src = fetchurl {
url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-vC/1j0nCmqx7/3BabBZ6gh8mxRIHn/CKxDL9D9ybsZk=";
+ sha256 = "sha256-tdJdbjczUcLtGbVitHMtAdJYmsjI6eeWLY3xIHzDEbg=";
};
outputs = [ "out" "dev" ]; # TODO: fix referrers
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix
index 0afef1c9fd82..396acbc1bdf2 100644
--- a/pkgs/development/libraries/faad2/default.nix
+++ b/pkgs/development/libraries/faad2/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "An open source MPEG-4 and MPEG-2 AAC decoder";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index e26ebef0c518..98c660dc798d 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -11,25 +11,21 @@
, gst-plugins-good
, gst-plugins-bad
, gst-libav
+, python3
}:
stdenv.mkDerivation rec {
pname = "farstream";
- version = "0.2.8";
+ version = "0.2.9";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/farstream/releases/farstream/${pname}-${version}.tar.gz";
- sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
+ sha256 = "0yzlh9jf47a3ir40447s7hlwp98f9yr8z4gcm0vjwz6g6cj12zfb";
};
patches = [
- # Python has not been used for ages
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch";
- sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn";
- })
# Fix build with newer gnumake.
(fetchpatch {
url = "https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.diff";
@@ -47,6 +43,7 @@ stdenv.mkDerivation rec {
pkg-config
autoreconfHook
gobject-introspection
+ python3
];
propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 8d2144f10395..9d9a1a126cb2 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -32,7 +32,6 @@
, avdeviceLibrary ? true # Build avdevice library
, avfilterLibrary ? true # Build avfilter library
, avformatLibrary ? true # Build avformat library
-, avresampleLibrary ? true # Build avresample library
, avutilLibrary ? true # Build avutil library
, postprocLibrary ? true # Build postproc library
, swresampleLibrary ? true # Build swresample library
@@ -100,6 +99,7 @@
, libxcbshapeExtlib ? true # X11 grabbing shape rendering
, libXv ? null # Xlib support
, libXext ? null # Xlib support
+, libxml2 ? null # libxml2 support, for IMF and DASH demuxers
, xz ? null # xz-utils
, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support
@@ -225,7 +225,6 @@ assert avdeviceLibrary -> avformatLibrary
&& avcodecLibrary
&& avutilLibrary; # configure flag since 0.6
assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6
-assert avresampleLibrary -> avutilLibrary;
assert postprocLibrary -> avutilLibrary;
assert swresampleLibrary -> soxr != null;
assert swscaleLibrary -> avutilLibrary;
@@ -304,7 +303,6 @@ stdenv.mkDerivation rec {
(enableFeature avdeviceLibrary "avdevice")
(enableFeature avfilterLibrary "avfilter")
(enableFeature avformatLibrary "avformat")
- (enableFeature avresampleLibrary "avresample")
(enableFeature avutilLibrary "avutil")
(enableFeature (postprocLibrary && gplLicensing) "postproc")
(enableFeature swresampleLibrary "swresample")
@@ -375,6 +373,7 @@ stdenv.mkDerivation rec {
(enableFeature libxcbshmExtlib "libxcb-shm")
(enableFeature libxcbxfixesExtlib "libxcb-xfixes")
(enableFeature libxcbshapeExtlib "libxcb-shape")
+ (enableFeature (libxml2 != null) "libxml2")
(enableFeature (xz != null) "lzma")
(enableFeature nvenc "nvenc")
(enableFeature (openal != null) "openal")
@@ -432,7 +431,7 @@ stdenv.mkDerivation rec {
bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
- libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
+ libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
zeromq4 zimg zlib openh264
] ++ optionals openglExtlib [ libGL libGLU ]
@@ -454,7 +453,7 @@ stdenv.mkDerivation rec {
checkPhase = let
ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in ''
- ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \
+ ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \
make check -j$NIX_BUILD_CORES
'';
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index dfdbf8eb2f80..9bfee290871f 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ffmpegthumbnailer";
- version = "2.2.2";
+ version = "unstable-2021-09-02";
src = fetchFromGitHub {
owner = "dirkvdb";
repo = "ffmpegthumbnailer";
- rev = version;
- sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich";
+ rev = "d92e191dd793b12cee0a0f685f5a8d8252988399";
+ sha256 = "1ysfq3g74b8ivivrdpfi4vm23d3cyc3rfla5i6y8q9aycis9xv6q";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 283942df63f9..6e7a58f5597e 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, pkg-config
-, ffmpeg
+, ffmpeg_4
, zlib
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
- ffmpeg
+ ffmpeg_4
zlib
];
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index f4b30129e610..4f3d685c1fa4 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -3,7 +3,7 @@
, lib
, gfortran
, perl
-, llvmPackages ? null
+, llvmPackages
, precision ? "double"
, enableAvx ? stdenv.hostPlatform.avxSupport
, enableAvx2 ? stdenv.hostPlatform.avx2Support
@@ -11,24 +11,20 @@
, enableFma ? stdenv.hostPlatform.fmaSupport
, enableMpi ? false
, mpi
+, withDoc ? stdenv.cc.isGNU
}:
with lib;
-assert stdenv.cc.isClang -> llvmPackages != null;
assert elem precision [ "single" "double" "long-double" "quad-precision" ];
-let
+stdenv.mkDerivation rec {
+ pname = "fftw-${precision}";
version = "3.3.10";
- withDoc = stdenv.cc.isGNU;
-in
-
-stdenv.mkDerivation {
- name = "fftw-${precision}-${version}";
src = fetchurl {
urls = [
- "http://fftw.org/fftw-${version}.tar.gz"
+ "https://fftw.org/fftw-${version}.tar.gz"
"ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"
];
sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc=";
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 592c14579fda..c97f1effd67c 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
# Hardcode paths used by Flatpak itself.
(substituteAll {
src = ./fix-paths.patch;
- p11kit = "${p11-kit.dev}/bin/p11-kit";
+ p11kit = "${p11-kit.bin}/bin/p11-kit";
})
# Adapt paths exposed to sandbox for NixOS.
diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix
deleted file mode 100644
index ca4a3c98e0a6..000000000000
--- a/pkgs/development/libraries/giblib/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }:
-
-stdenv.mkDerivation rec {
- pname = "giblib";
- version = "1.2.4";
-
- src = fetchurl {
- url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz";
- sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
- };
-
- outputs = [ "out" "dev" ];
- setOutputFlags = false;
-
- preConfigure = ''
- configureFlagsArray+=(
- --includedir=$dev/include
- )
- '';
-
- buildInputs = [ xlibsWrapper ];
- propagatedBuildInputs = [ imlib2 ];
-
- postFixup = ''
- moveToOutput bin/giblib-config "$dev"
-
- # Doesn't contain useful stuff
- rm -rf $out/share/doc
- '';
-
- meta = {
- homepage = "http://linuxbrit.co.uk/giblib/";
- description = "wrapper library for imlib2, and other stuff";
- platforms = lib.platforms.unix;
- license = lib.licenses.mit;
- };
-}
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 29eb1b948247..07c97ea6e0d6 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -30,13 +30,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "gjs";
- version = "1.70.0";
+ version = "1.70.1";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8=";
+ sha256 = "sha256-u9wO7HzyX7xTR2n2ofssehjhe4ce/bDKWOmr8IsoAD8=";
};
patches = [
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 25b7770101d1..667d50ca4d8b 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -46,6 +46,15 @@ stdenv.mkDerivation rec {
src = ./absolute_shlib_path.patch;
inherit nixStoreDir;
})
+ # Fix build with meson 0.61.0
+ (fetchurl {
+ url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/827494d6415b696a98fa195cbd883b50cc893bfc.patch";
+ sha256 = "sha256-imVWzU760FRsX+eXREQDQ6mDcmzZ5ASLT9rBf4oyBGQ=";
+ })
+ (fetchurl {
+ url = "https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2.patch";
+ sha256 = "sha256-o7a0qDT5IYcYcz8toeZu+nPj3SwS52sNgmxgzsmlp4Q=";
+ })
] ++ lib.optionals x11Support [
# Hardcode the cairo shared library path in the Cairo gir shipped with this package.
# https://github.com/NixOS/nixpkgs/issues/34080
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 016a7a992ed9..e575173d7257 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -8,18 +8,20 @@
, python3
, gst-plugins-base
, orc
+, gstreamer
, gobject-introspection
, enableZbar ? false
, faacSupport ? false
, faac
, faad2
+, ldacbt
, libass
, libkate
-, libmms
, lrdf
, ladspaH
, libnice
, webrtc-audio-processing
+, webrtc-audio-processing_1
, lilv
, lv2
, serd
@@ -27,7 +29,7 @@
, sratom
, libbs2b
, libmodplug
-, mpeg2dec
+, libmpeg2
, libmicrodns
, openjpeg
, libopus
@@ -39,6 +41,7 @@
, fdk_aac
, flite
, gsm
+, json-glib
, libaom
, libdc1394
, libde265
@@ -46,7 +49,7 @@
, libdvdnav
, libdvdread
, libgudev
-, libofa
+, qrencode
, libsndfile
, libusb1
, neon
@@ -88,24 +91,20 @@
, CoreVideo
, Foundation
, MediaToolbox
+, enableGplPlugins ? true
}:
stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
- version = "1.18.5";
+ version = "1.20.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-oWSSO5Tw0IV4pvyuqsbgwF2niKRpA6EIaHDpykWtZ44=";
+ sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0=";
};
- patches = [
- # Use pkgconfig to inject the includedirs
- ./fix_pkgconfig_includedir.patch
- ];
-
nativeBuildInputs = [
meson
ninja
@@ -113,6 +112,7 @@ stdenv.mkDerivation rec {
orc # for orcc
python3
gettext
+ gstreamer # for gst-tester-1.0
gobject-introspection
] ++ lib.optionals stdenv.isLinux [
wayland # for wayland-scanner
@@ -124,14 +124,14 @@ stdenv.mkDerivation rec {
# gobject-introspection has to be in both nativeBuildInputs and
# buildInputs. The build tries to link against libgirepository-1.0.so
gobject-introspection
- faad2
+ json-glib
+ ldacbt
libass
libkate
- libmms
- webrtc-audio-processing # webrtc
+ webrtc-audio-processing # required by webrtcdsp
+ #webrtc-audio-processing_1 # required by isac
libbs2b
libmodplug
- mpeg2dec
libmicrodns
openjpeg
libopenmpt
@@ -145,9 +145,9 @@ stdenv.mkDerivation rec {
libde265
libdvdnav
libdvdread
+ qrencode
libsndfile
libusb1
- mjpegtools
neon
openal
opencv4
@@ -166,7 +166,6 @@ stdenv.mkDerivation rec {
libGLU
libgme
openssl
- x265
libxml2
libintl
srt
@@ -175,6 +174,11 @@ stdenv.mkDerivation rec {
zbar
] ++ lib.optionals faacSupport [
faac
+ ] ++ lib.optionals enableGplPlugins [
+ libmpeg2
+ mjpegtools
+ faad2
+ x265
] ++ lib.optionals stdenv.isLinux [
bluez
libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
@@ -193,7 +197,6 @@ stdenv.mkDerivation rec {
libdrm
libgudev
libnice
- libofa
sbc
spandsp
@@ -229,7 +232,7 @@ stdenv.mkDerivation rec {
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
"-Dzbar=${if enableZbar then "enabled" else "disabled"}"
"-Dfaac=${if faacSupport then "enabled" else "disabled"}"
- "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing
+ "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing, also this is AGPL so update license when adding support
"-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing
"-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support
# As of writing, with `libmpcdec` in `buildInputs` we get
@@ -255,6 +258,10 @@ stdenv.mkDerivation rec {
"-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support
"-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
"-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
+ "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3
+ "-Dgs=disabled" # depends on `google-cloud-cpp`
+ "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing
+ "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235
]
++ lib.optionals (!stdenv.isLinux) [
"-Dva=disabled" # see comment on `libva` in `buildInputs`
@@ -286,7 +293,17 @@ stdenv.mkDerivation rec {
"-Dapplemedia=disabled"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dintrospection=disabled"
- ];
+ ] ++ (if enableGplPlugins then [
+ "-Dgpl=enabled"
+ ] else [
+ "-Ddts=disabled"
+ "-Dfaad=disabled"
+ "-Diqa=disabled"
+ "-Dmpeg2enc=disabled"
+ "-Dmplex=disabled"
+ "-Dresindvd=disabled"
+ "-Dx265=disabled"
+ ]);
# Argument list too long
strictDeps = true;
@@ -311,7 +328,7 @@ stdenv.mkDerivation rec {
something - be it a good code review, some documentation, a set of tests,
a real live maintainer, or some actual wide use.
'';
- license = licenses.lgpl2Plus;
+ license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ matthewbauer ];
};
diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
deleted file mode 100644
index c687fffc9c08..000000000000
--- a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index 271f327f3..7e2afa754 100644
---- a/pkgconfig/meson.build
-+++ b/pkgconfig/meson.build
-@@ -2,8 +2,8 @@ pkgconf = configuration_data()
-
- pkgconf.set('prefix', join_paths(get_option('prefix')))
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', api_version)
- pkgconf.set('VERSION', gst_version)
-
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 8b6073cb9588..82d90845677c 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -41,19 +41,15 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-base";
- version = "1.18.5";
+ version = "1.20.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M=";
+ sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw=";
};
- patches = [
- ./fix_pkgconfig_includedir.patch
- ];
-
nativeBuildInputs = [
meson
ninja
@@ -120,7 +116,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs \
- common/scangobj-merge.py \
+ scripts/meson-pkg-config-file-fixup.py \
scripts/extract-release-date-from-doap-file.py
'';
diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
deleted file mode 100644
index 04486a4647f9..000000000000
--- a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index 04abfbee5..88c86b431 100644
---- a/pkgconfig/meson.build
-+++ b/pkgconfig/meson.build
-@@ -2,8 +2,8 @@ pkgconf = configuration_data()
-
- pkgconf.set('prefix', get_option('prefix'))
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', api_version)
- pkgconf.set('VERSION', gst_version)
- pkgconf.set('LIBM', libm.found() ? '-lm' : '')
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 268da0171630..fa1188347731 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "gstreamer";
- version = "1.18.5";
+ version = "1.20.0";
outputs = [
"bin"
@@ -34,13 +34,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao=";
+ sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc=";
};
- patches = [
- ./fix_pkgconfig_includedir.patch
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
deleted file mode 100644
index db1684269350..000000000000
--- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index edb0586c2..7ed46dfce 100644
---- a/pkgconfig/meson.build
-+++ b/pkgconfig/meson.build
-@@ -2,8 +2,8 @@ pkgconf = configuration_data()
-
- pkgconf.set('prefix', join_paths(get_option('prefix')))
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-+pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
-+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', apiversion)
- pkgconf.set('VERSION', gst_version)
- pkgconf.set('LIBM', mathlib.found() ? '-lm' : '')
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 0b7be2bd03ec..aa92410e0e48 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
+, cairo
, meson
, ninja
, pkg-config
@@ -12,17 +13,13 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
- version = "1.18.5";
+ version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-/s/8hkR9r1wqBoQ8dXqZHXRcqiBpRGoNdG6ZsT98sHk=";
+ sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0=";
};
- patches = [
- ./fix_pkgconfig_includedir.patch
- ];
-
outputs = [
"out"
"dev"
@@ -40,6 +37,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ cairo
python3
json-glib
];
diff --git a/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch
deleted file mode 100644
index ff19c7cbf6f8..000000000000
--- a/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build
-index a612b21b..c017eaff 100644
---- a/validate/pkgconfig/meson.build
-+++ b/validate/pkgconfig/meson.build
-@@ -2,8 +2,8 @@ pkgconf = configuration_data()
-
- pkgconf.set('prefix', get_option('prefix'))
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', apiversion)
- pkgconf.set('VERSION', gst_version)
-
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 0bfe6f3e0e2f..4630ce6d0ce4 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
- version = "1.18.5";
+ version = "1.20.0";
outputs = [
"out"
@@ -26,13 +26,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-ivSoOU0FHz4YKAaG20mm76zMlcDFmhfw9WTjIABZDfU=";
+ sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8=";
};
- patches = [
- ./fix_pkgconfig_includedir.patch
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
deleted file mode 100644
index 1e12f3bbfbea..000000000000
--- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
-index a612b21b..c017eaff 100644
---- a/pkgconfig/meson.build
-+++ b/pkgconfig/meson.build
-@@ -2,8 +2,8 @@ pkgconf = configuration_data()
-
- pkgconf.set('prefix', get_option('prefix'))
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', apiversion)
- pkgconf.set('VERSION', gst_version)
-
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a6ed248b663d..3b686e4c7f59 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -48,13 +48,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
- version = "1.18.5";
+ version = "1.20.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-Oq7up3Zfv4gBrM5KUDqbBfc/BOijU1Lp0AIyz9VVeWs=";
+ sha256 = "sha256-LRGcFauMnnn4zTxr9YL/egULKMyuUqtIZeGhRkmRZZw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 7f2828253c88..0d9f22d7d65f 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -5,6 +5,7 @@
, ninja
, pkg-config
, python3
+, gstreamer
, gst-plugins-base
, gettext
, libav
@@ -15,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
- version = "1.18.5";
+ version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-gi4AipEOndE67b3Y3GP+3vQEDA7i6Se6sxEuneaTpUg=";
+ sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc=";
};
outputs = [ "out" "dev" ];
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ gstreamer
gst-plugins-base
libav
];
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index a75af25224a0..80190200c26c 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
, fetchurl
, meson
, ninja
@@ -12,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
- version = "1.18.5";
+ version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-BNY79IgWxvQcc/beD5EqfO8KqznEQWKnvOzhkj38nR8=";
+ sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM=";
};
outputs = [
@@ -25,15 +26,6 @@ stdenv.mkDerivation rec {
# "devdoc" # disabled until `hotdoc` is packaged in nixpkgs
];
- patches = [
- # To use split outputs, we need this so double prefix won't be used in the
- # pkg-config files. Hopefully, this won't be needed on the next release,
- # _if_
- # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1
- # will be merged. For the current release, this merge request won't apply.
- ./fix_pkgconfig_includedir.patch
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch
deleted file mode 100644
index d31fe19fb0fe..000000000000
--- a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build
-index 8ed8299..594cbfe 100644
---- i/pkgconfig/meson.build
-+++ w/pkgconfig/meson.build
-@@ -2,8 +2,8 @@ pkgconf = configuration_data()
-
- pkgconf.set('prefix', get_option('prefix'))
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
- pkgconf.set('GST_API_VERSION', api_version)
- pkgconf.set('VERSION', gst_version)
-
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 7c4b21f7c833..05133271f846 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -19,17 +19,18 @@
, IOKit
, CoreFoundation
, DiskArbitration
+, enableGplPlugins ? true
}:
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
- version = "1.18.5";
+ version = "1.20.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-3zKAPpj4qZeTc/osp+BeYvl3sQl1dtOoBhnZ9cafZtk=";
+ sha256 = "sha256-To3LXSZVLwpJN/a8Ynm9kHD1XKauDqoy1y0mTEQAHC4=";
};
nativeBuildInputs = [
@@ -43,14 +44,15 @@ stdenv.mkDerivation rec {
buildInputs = [
gst-plugins-base
orc
+ libintl
+ opencore-amr
+ ] ++ lib.optionals enableGplPlugins [
a52dec
libcdio
libdvdread
libmad
libmpeg2
x264
- libintl
- opencore-amr
] ++ lib.optionals stdenv.isDarwin [
IOKit
CoreFoundation
@@ -60,7 +62,16 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
"-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
- ];
+ ] ++ (if enableGplPlugins then [
+ "-Dgpl=enabled"
+ ] else [
+ "-Da52dec=disabled"
+ "-Dcdio=disabled"
+ "-Ddvdread=disabled"
+ "-Dmpeg2dec=disabled"
+ "-Dsidplay=disabled"
+ "-Dx264=disabled"
+ ]);
postPatch = ''
patchShebangs \
@@ -76,7 +87,7 @@ stdenv.mkDerivation rec {
the plug-ins or the supporting libraries might not be how we'd
like. The code might be widely known to present patent problems.
'';
- license = licenses.lgpl2Plus;
+ license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ matthewbauer ];
};
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 5de9a247a527..c8b6230cd595 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
- version = "1.18.5";
+ version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-SkYPuVVZ9BRE6ySGStLZ43kitu6pQVEDEDGfw+C6cns=";
+ sha256 = "sha256-95pHNG39XlheBj53B45fxJiwbe6JW/y/R9iGP8rJ6jI=";
};
outputs = [
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index cc6287eace70..1e36f1e7f0f7 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -24,7 +24,7 @@
}:
let
- version = "3.1.2";
+ version = "3.2.0";
inherit (lib) optional optionals optionalString;
mesonFeatureFlag = opt: b:
"-D${opt}=${if b then "enabled" else "disabled"}";
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
owner = "harfbuzz";
repo = "harfbuzz";
rev = version;
- sha256 = "sha256-1xndbJhx+1AzJNnpvvdEcBHPZMPaMI03h6sG2h1d3qs=";
+ sha256 = "sha256-iNYp/hyJTaaF6e09YpUL7ktBhq2wRN9zKiEH59WLbYU=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 70e9a39e03fe..ffe534ede4af 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "hidapi";
- version = "0.11.0";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "libusb";
repo = "hidapi";
rev = "${pname}-${version}";
- sha256 = "0dzigvmwbg20b33xn0sklnf489m8g84yrcm8kqlrsd7x8iymsg63";
+ sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index b61f4e442bf2..1447a327e0df 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
pname = "imlib2";
- version = "1.7.3";
+ version = "1.7.5";
src = fetchurl {
- url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2";
- sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc=";
+ url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz";
+ hash = "sha256-RY2DAKp6bUzjU1GDi7pdn9+wiES9WxU8WTjs/kP/Ngo=";
};
buildInputs = [
@@ -28,11 +28,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preConfigure = ''
- substituteInPlace imlib2-config.in \
- --replace "@my_libs@" ""
- '';
-
# Do not build amd64 assembly code on Darwin, because it fails to compile
# with unknow directive errors
configureFlags = optional stdenv.isDarwin "--enable-amd64=no"
@@ -40,10 +35,6 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" ];
- postInstall = ''
- moveToOutput bin/imlib2-config "$dev"
- '';
-
meta = with lib; {
description = "Image manipulation library";
@@ -56,7 +47,8 @@ stdenv.mkDerivation rec {
'';
homepage = "https://docs.enlightenment.org/api/imlib2/html";
- license = licenses.mit;
+ changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}";
+ license = licenses.imlib2;
platforms = platforms.unix;
maintainers = with maintainers; [ spwhitt ];
};
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index 4135f6bfd7aa..ac077b73d6a6 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -59,23 +59,24 @@ xdgDataSubdirs=( \
"wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \
)
-ecmHostPathSeen=( )
+# ecmHostPathsSeen is an associative array of the paths that have already been
+# seen by ecmHostPathHook.
+declare -gA ecmHostPathsSeen
-ecmUnseenHostPath() {
- for pkg in "${ecmHostPathSeen[@]}"
- do
- if [ "${pkg:?}" == "$1" ]
- then
- return 1
- fi
- done
-
- ecmHostPathSeen+=("$1")
- return 0
+ecmHostPathIsNotSeen() {
+ if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then
+ # The path has been seen before.
+ return 1
+ else
+ # The path has not been seen before.
+ # Now it is seen, so record it.
+ ecmHostPathsSeen["$1"]=1
+ return 0
+ fi
}
ecmHostPathHook() {
- ecmUnseenHostPath "$1" || return 0
+ ecmHostPathIsNotSeen "$1" || return 0
local xdgConfigDir="$1/etc/xdg"
if [ -d "$xdgConfigDir" ]
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 825e757c7a8e..50204bc0ec0e 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.89/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.90/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 3465fc63da29..1ffc5df68c36 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
{
attica = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/attica-5.89.0.tar.xz";
- sha256 = "03q2ajvwrl1x6h0jcvc6nh0avj7dqhx4k1lx5qa3xgfxwk01kgp9";
- name = "attica-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/attica-5.90.0.tar.xz";
+ sha256 = "0zs37qyh9biafk76ps2xfc41hbd1n4dq42qqqcvbqcrwfgqz2wlk";
+ name = "attica-5.90.0.tar.xz";
};
};
baloo = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/baloo-5.89.0.tar.xz";
- sha256 = "091gjzn4armm4xs61csavwgij54mv8v9hx3gvva18g06gjkajyis";
- name = "baloo-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/baloo-5.90.0.tar.xz";
+ sha256 = "1nnfys8dyiivd2if81qrgrmpprfni77an9l3wff0l5k85ac86i56";
+ name = "baloo-5.90.0.tar.xz";
};
};
bluez-qt = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/bluez-qt-5.89.0.tar.xz";
- sha256 = "00wczjvvhxzi12ijf65d66x36gm0x6j5z3b6cwqgdz2s66wr0jw5";
- name = "bluez-qt-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/bluez-qt-5.90.0.tar.xz";
+ sha256 = "056i5ndrg5fqm1bx49a0plfhlladphha128wi766zdhcm6np11z3";
+ name = "bluez-qt-5.90.0.tar.xz";
};
};
breeze-icons = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/breeze-icons-5.89.0.tar.xz";
- sha256 = "12l2wzc3pah5qapznriaffh4wz97s6nqxlj9i119k9qw295d6wfw";
- name = "breeze-icons-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/breeze-icons-5.90.0.tar.xz";
+ sha256 = "06dfh571rf8gp4gnnqn13xqgc1bpc4ycn6bmxf38x53fxxfl3fnn";
+ name = "breeze-icons-5.90.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/extra-cmake-modules-5.89.0.tar.xz";
- sha256 = "0bzhd6xcphrcnbg8ylx91rq5y3vvl3jfcgik19bvh8sr4ad25mrx";
- name = "extra-cmake-modules-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/extra-cmake-modules-5.90.0.tar.xz";
+ sha256 = "1c5wza7srib3mdkf29ygmyj5b6jq322s6h7k5hlljqm5xhy7q07k";
+ name = "extra-cmake-modules-5.90.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/frameworkintegration-5.89.0.tar.xz";
- sha256 = "0f7cqxmgnwi4n8fa8vifqaysbk7839x1qbmp9qfa998jxnn1w92f";
- name = "frameworkintegration-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/frameworkintegration-5.90.0.tar.xz";
+ sha256 = "1v7vlq2gk7j5b6gzbawgnpii7csh2zclp5v24qhx4qrmpfssylan";
+ name = "frameworkintegration-5.90.0.tar.xz";
};
};
kactivities = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kactivities-5.89.0.tar.xz";
- sha256 = "1dhxl487246kpx4w5zhhdgk94jwns09dvragvh2bb787mszqq5v9";
- name = "kactivities-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kactivities-5.90.0.tar.xz";
+ sha256 = "0wf7nnf3bjz2iq2wqxnyay1100ks0zscsh7sa8xfcijrl7pp305w";
+ name = "kactivities-5.90.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kactivities-stats-5.89.0.tar.xz";
- sha256 = "1pp3vkkadaday0pzd09hdhccw6hbrqp481hcdzzyqj1x2ckb59bj";
- name = "kactivities-stats-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kactivities-stats-5.90.0.tar.xz";
+ sha256 = "0qamy8xggjlnm8pkv6vxbaagcp1hg9vgi2ws2yb9xpqk8mdlfbvp";
+ name = "kactivities-stats-5.90.0.tar.xz";
};
};
kapidox = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kapidox-5.89.0.tar.xz";
- sha256 = "0a3vwh3rzpcaylz77fs4biiadljchs2lfh6svg149yg95yqwng3b";
- name = "kapidox-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kapidox-5.90.0.tar.xz";
+ sha256 = "16jl519sx7pirjp5x57x5gbgv477457063rrbwpvyf2ldb6lc29p";
+ name = "kapidox-5.90.0.tar.xz";
};
};
karchive = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/karchive-5.89.0.tar.xz";
- sha256 = "1s45mns9km1fy2d07d2nmslf4dc2pl5i169ncq2dc7vabjvyh59b";
- name = "karchive-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/karchive-5.90.0.tar.xz";
+ sha256 = "0411rpgr9dy0zf9mmhj7n7ax0afrn7zvkpzpnjvpvvqsrfkz7qm6";
+ name = "karchive-5.90.0.tar.xz";
};
};
kauth = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kauth-5.89.0.tar.xz";
- sha256 = "1ys9xr7js8rj07ff7ncp9d52rcn10bg49jcyg4ldam07bfpq36nz";
- name = "kauth-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kauth-5.90.0.tar.xz";
+ sha256 = "1g4i1prspcczpx25wvd8lgdk8c3my7kp3wv489gvcci40rl5z913";
+ name = "kauth-5.90.0.tar.xz";
};
};
kbookmarks = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kbookmarks-5.89.0.tar.xz";
- sha256 = "16bh5daimpjwy0gz56v32vslnmzmyfsf8z92s5gi13bkjfp03syn";
- name = "kbookmarks-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kbookmarks-5.90.0.tar.xz";
+ sha256 = "1svc1i9zxbxf65crfhnv6sz5gknb7x87lzjd8cn11y5lwnsw36kx";
+ name = "kbookmarks-5.90.0.tar.xz";
};
};
kcalendarcore = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcalendarcore-5.89.0.tar.xz";
- sha256 = "1xy045d5jl3qk9ka13ximk7x70q5pswh143kqk7cf6x0f7bvgpap";
- name = "kcalendarcore-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcalendarcore-5.90.0.tar.xz";
+ sha256 = "0qbds2ysjv9rqwpvrhisvdd6wyhq5qwhbw5xcbj7ndxwpf8lpa8w";
+ name = "kcalendarcore-5.90.0.tar.xz";
};
};
kcmutils = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcmutils-5.89.0.tar.xz";
- sha256 = "0za9x8v9lnwyib1gip6wbmda19wfjaf2yh6yiqlszxcbsfq7kzhm";
- name = "kcmutils-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcmutils-5.90.0.tar.xz";
+ sha256 = "04crq3j48xwlvp047p3waqrv1gg5sv1950jh02w85q00yjjh0qxk";
+ name = "kcmutils-5.90.0.tar.xz";
};
};
kcodecs = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcodecs-5.89.0.tar.xz";
- sha256 = "1j2pmsyi8lvhnzhrrvsm98x7inf503vr2b58yl070zp293fyhd9q";
- name = "kcodecs-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcodecs-5.90.0.tar.xz";
+ sha256 = "0kwqyhjs63pqslqcmv3sngyqvl6ah8iaa6nn045sb8a58xb09inh";
+ name = "kcodecs-5.90.0.tar.xz";
};
};
kcompletion = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcompletion-5.89.0.tar.xz";
- sha256 = "0bv9kxrdprk1jvsf9mqkag0pkq7h1wngdpvdx9wfy4kkbj7y46zf";
- name = "kcompletion-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcompletion-5.90.0.tar.xz";
+ sha256 = "0hd3nsixibw5z846mpib2lap3ar65rqvasifdnlmqsrvxfmw0ggk";
+ name = "kcompletion-5.90.0.tar.xz";
};
};
kconfig = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kconfig-5.89.0.tar.xz";
- sha256 = "0ixil0qyd8byn4ix5w9mp5kdvkscnwhamknrnbqzikhmmknprccf";
- name = "kconfig-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kconfig-5.90.0.tar.xz";
+ sha256 = "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn";
+ name = "kconfig-5.90.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kconfigwidgets-5.89.0.tar.xz";
- sha256 = "0rzqx2knc8bc26jyislb1dw5qdhmkga3cqlyiyynbawx3scind60";
- name = "kconfigwidgets-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kconfigwidgets-5.90.0.tar.xz";
+ sha256 = "1sm1x64x2v3xfcz9ia6qk8d8y1q02fggrc2q0yy5ag5xh1yr9zwq";
+ name = "kconfigwidgets-5.90.0.tar.xz";
};
};
kcontacts = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcontacts-5.89.0.tar.xz";
- sha256 = "1yjgrzn3bx8fzmr6mjd2c99gxlh0nqm1fi3sgmcn1bj07jdrp52r";
- name = "kcontacts-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcontacts-5.90.0.tar.xz";
+ sha256 = "0vv2136da5a6lwdj2x38jx2qwrk96hgn8iwaad4yynvc2csx6dim";
+ name = "kcontacts-5.90.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcoreaddons-5.89.0.tar.xz";
- sha256 = "0ss27wz8z2lfhn0njads2rwd62aciamr0vcbj4gyfiv2ddw8bl71";
- name = "kcoreaddons-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcoreaddons-5.90.0.tar.xz";
+ sha256 = "02m4h4r0kdy94zq8c6d2fhnd8qwrp4a0v5i4wf6khk4yf4fqy5kf";
+ name = "kcoreaddons-5.90.0.tar.xz";
};
};
kcrash = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kcrash-5.89.0.tar.xz";
- sha256 = "07pc449qqvz6rfs1wk6r2jgfncpliig8c1cxzhbkzqrkcf1gj6ba";
- name = "kcrash-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kcrash-5.90.0.tar.xz";
+ sha256 = "0634jqzbvr8xkv53n2q3fcqlkcmq843w7g455v3swnlaqi92l04f";
+ name = "kcrash-5.90.0.tar.xz";
};
};
kdav = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kdav-5.89.0.tar.xz";
- sha256 = "1wyg6bxfp1r1snk40y6q70ix00aqwx4sl4z7jrg12h38cnc8sa6v";
- name = "kdav-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kdav-5.90.0.tar.xz";
+ sha256 = "0181ray8vigmwlamx4j5dinw10al0g4l965kyx4wjq9k59nxxgbi";
+ name = "kdav-5.90.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kdbusaddons-5.89.0.tar.xz";
- sha256 = "1yh5xx01wsjcj6axcw1r94p32rrs111078prssgnngbrihbhbjzh";
- name = "kdbusaddons-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kdbusaddons-5.90.0.tar.xz";
+ sha256 = "0g609bymfixwaic30y7i0q96anf7pi3galipmjbbfg85ghj9rsa4";
+ name = "kdbusaddons-5.90.0.tar.xz";
};
};
kdeclarative = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kdeclarative-5.89.0.tar.xz";
- sha256 = "18a4rcx60h5j44d79bhr2l46f3lhgnf2x0sb64dr7dcc0m5rmsay";
- name = "kdeclarative-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kdeclarative-5.90.0.tar.xz";
+ sha256 = "1z7zyj6pw2ym3izi19kpgy12mqpar6mbdbsn6jpxy36l6m3jld1y";
+ name = "kdeclarative-5.90.0.tar.xz";
};
};
kded = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kded-5.89.0.tar.xz";
- sha256 = "1rr3g7b60zlx8j7d7k2hlhhv2wa67lakfpyd1zgpy2y3k281hbfl";
- name = "kded-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kded-5.90.0.tar.xz";
+ sha256 = "094g6p87nd5cxcars71315w6zrxjgiw2080p6cf6g72ww54k7sps";
+ name = "kded-5.90.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kdelibs4support-5.89.0.tar.xz";
- sha256 = "1672f75f0wmdrqhx9vynzgflm3ssmngkpp1r5li53ppb11wg6sbr";
- name = "kdelibs4support-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kdelibs4support-5.90.0.tar.xz";
+ sha256 = "0zxc11jbg06qz79ljrd6wl36jp73hafcmbk29d0hcvxnkscg3k29";
+ name = "kdelibs4support-5.90.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kdesignerplugin-5.89.0.tar.xz";
- sha256 = "0g8y51i70m8s7y829qyqnki57s8d4l3xdpdbn1p2rr1szglj8hvf";
- name = "kdesignerplugin-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kdesignerplugin-5.90.0.tar.xz";
+ sha256 = "18gsy8f32hjadzjnavi3dsknc6hflcnfpr0107lwfc735fd2x2iq";
+ name = "kdesignerplugin-5.90.0.tar.xz";
};
};
kdesu = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kdesu-5.89.0.tar.xz";
- sha256 = "0jmww11l6709cpfriwklhij5izsh948mki9grzzq3jijw8zs0mrx";
- name = "kdesu-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kdesu-5.90.0.tar.xz";
+ sha256 = "1q8k2q7c41fzw9gwx9nq4zjpjdwvh29zyh3zd0w3r2kxf6vhf1wp";
+ name = "kdesu-5.90.0.tar.xz";
};
};
kdewebkit = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kdewebkit-5.89.0.tar.xz";
- sha256 = "0xwd346z928yk4iwykgashc36m2xqnwn49jix5jbk1w57dbia2da";
- name = "kdewebkit-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kdewebkit-5.90.0.tar.xz";
+ sha256 = "19dqlxy2sl822aldqy1jj7fvxabmg97a0av7d5ayzhnbhhy5izx1";
+ name = "kdewebkit-5.90.0.tar.xz";
};
};
kdnssd = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kdnssd-5.89.0.tar.xz";
- sha256 = "0v72g137l8kl2xapfrcrw8w6zmn94h08hvwdggzr9fvgswzdbvsh";
- name = "kdnssd-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kdnssd-5.90.0.tar.xz";
+ sha256 = "17szlqsafz6p4h7s9wascaggn5909c1ig452wy6y4z4402s2lsrr";
+ name = "kdnssd-5.90.0.tar.xz";
};
};
kdoctools = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kdoctools-5.89.0.tar.xz";
- sha256 = "1x8q45y2sgi3d9j79qcx02z2939j52mp1jrs3rjqq42xxvvrlcg1";
- name = "kdoctools-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kdoctools-5.90.0.tar.xz";
+ sha256 = "1l2a9mlcm8np3s8myq0hj08l82284r90yhx3z2gn7h68b8fzyx0s";
+ name = "kdoctools-5.90.0.tar.xz";
};
};
kemoticons = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kemoticons-5.89.0.tar.xz";
- sha256 = "0mcyq20ca6x73jhwwhhwq8jzqpadnazjy5y9dyfa2wz8ijbnjqzw";
- name = "kemoticons-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kemoticons-5.90.0.tar.xz";
+ sha256 = "08mgk56dafj3q9gs69qcx17qfc45s8ifkjrpzg44p8zs0q51q6cb";
+ name = "kemoticons-5.90.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kfilemetadata-5.89.0.tar.xz";
- sha256 = "04abysdijmpdd05grihawpbw8f9h3fhlv3y7wjz76kl66gyqg035";
- name = "kfilemetadata-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kfilemetadata-5.90.0.tar.xz";
+ sha256 = "18y4bn6hz8xa68m0nxv88a1f3xkkks7c7pbiqb1vkrp9bbh52yax";
+ name = "kfilemetadata-5.90.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kglobalaccel-5.89.0.tar.xz";
- sha256 = "0jxxlhmwsgrx1p6w1al9c11bglxn5im181wqih7ds5h2naa7b8kj";
- name = "kglobalaccel-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kglobalaccel-5.90.0.tar.xz";
+ sha256 = "04qd1fcc22x70jacqzrv44q1jg5ldzynlfpw5cg2679409r0wnxw";
+ name = "kglobalaccel-5.90.0.tar.xz";
};
};
kguiaddons = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kguiaddons-5.89.0.tar.xz";
- sha256 = "17mxkk4w4q6bkqblkdinw2b0jdfxhk7xkfy5hw730gjm6is6p861";
- name = "kguiaddons-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kguiaddons-5.90.0.tar.xz";
+ sha256 = "0m9l8xyc7xyj29fzxwp8ahr2l1rzs5rw1c26x446kb7smxvy8awx";
+ name = "kguiaddons-5.90.0.tar.xz";
};
};
kholidays = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kholidays-5.89.0.tar.xz";
- sha256 = "0ry0n73dkjxv7ani753mh8ymy4yblhj841ca5y5kci8wr9h6358w";
- name = "kholidays-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kholidays-5.90.0.tar.xz";
+ sha256 = "1p1kgy110ijk5a3ix4g9y1i7w0gsnzf82jdkwbdza95vibm82iz8";
+ name = "kholidays-5.90.0.tar.xz";
};
};
khtml = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/khtml-5.89.0.tar.xz";
- sha256 = "072pawwp62mx5shh8x4mcpr8h6a24qr82zyyiricz4jba0r7z3yr";
- name = "khtml-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/khtml-5.90.0.tar.xz";
+ sha256 = "1bi839x4dhlkqxmv98pq01725b8i8szdxf9b1hf1jv37fk468mja";
+ name = "khtml-5.90.0.tar.xz";
};
};
ki18n = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/ki18n-5.89.0.tar.xz";
- sha256 = "1zlq0ywd8hnaniwdv3vd76xmv91cdn6pqs6k9y6dz3fayl15p0g6";
- name = "ki18n-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/ki18n-5.90.0.tar.xz";
+ sha256 = "13k8kbkmgdywclcdbfj5ri3gmdblv8yzalmvqd0hn7sym6pkdqfw";
+ name = "ki18n-5.90.0.tar.xz";
};
};
kiconthemes = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kiconthemes-5.89.0.tar.xz";
- sha256 = "1hv8blvvg12agjynl0yvvsl8dfsyk2aa9clmq60igcs5lm4jpvaa";
- name = "kiconthemes-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kiconthemes-5.90.0.tar.xz";
+ sha256 = "0w3wi4xy1yy2s1a927cj4my63q0fqhw06ghy9zjw830m31xwpx1k";
+ name = "kiconthemes-5.90.0.tar.xz";
};
};
kidletime = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kidletime-5.89.0.tar.xz";
- sha256 = "0547yj8yn9nly3bkq3in38ljhwbg0bvj0wp3yxp2dl05wpyvzqfz";
- name = "kidletime-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kidletime-5.90.0.tar.xz";
+ sha256 = "1xzwmk0aqv1lcdi51nl1k0lyiinnqxwla6w0xxmsh6193qa3fpvq";
+ name = "kidletime-5.90.0.tar.xz";
};
};
kimageformats = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kimageformats-5.89.0.tar.xz";
- sha256 = "1m3fl14lzsfl0fam38nnalapc1xhpryf1ibvcm7bgh4g1cm1bvnw";
- name = "kimageformats-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kimageformats-5.90.0.tar.xz";
+ sha256 = "0r3ihkly0hf20aqbn7b9171mzqjna078rksdp96z6f7f1qy99v1v";
+ name = "kimageformats-5.90.0.tar.xz";
};
};
kinit = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kinit-5.89.0.tar.xz";
- sha256 = "1llaqz7yv011k4g1fvy1rzlff8bdgvqwqvh3s3nrqahwq2gx2rr9";
- name = "kinit-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kinit-5.90.0.tar.xz";
+ sha256 = "0z65hfhj68ahjm558p2pj7dlrczcww8f2xyw9f44w10bp3p5hf1a";
+ name = "kinit-5.90.0.tar.xz";
};
};
kio = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kio-5.89.0.tar.xz";
- sha256 = "1ka8s6cj7ms74w4xj6x91hx1ijlh883x3ibjwmbhva6mbzk1z0nx";
- name = "kio-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kio-5.90.0.tar.xz";
+ sha256 = "0ds6465fyzjj2azwdghrkxr9wvih0m96lv4kp6syqwii8nv2w7rs";
+ name = "kio-5.90.0.tar.xz";
};
};
kirigami2 = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kirigami2-5.89.0.tar.xz";
- sha256 = "1jn5c0lhh7hcp81278kagw0r96nri80x9vrg51jg7cs42h7pfp98";
- name = "kirigami2-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kirigami2-5.90.0.tar.xz";
+ sha256 = "0r48n11pv3yqsf11phl19cs52ph5ldabrfmq3xmsvxsknm6c4f9b";
+ name = "kirigami2-5.90.0.tar.xz";
};
};
kitemmodels = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kitemmodels-5.89.0.tar.xz";
- sha256 = "10bag80kjz4x22097z9w1liw73kkirk72266vr0qplyr00jwqi33";
- name = "kitemmodels-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kitemmodels-5.90.0.tar.xz";
+ sha256 = "0f7zlif7kskbwpw8yrzlfyl954b623icdd9qn0algjcc2i9gqbzi";
+ name = "kitemmodels-5.90.0.tar.xz";
};
};
kitemviews = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kitemviews-5.89.0.tar.xz";
- sha256 = "180n41gkv6vgmljcqh2sg5922glq59z56zq7y299vwnkgix9aqns";
- name = "kitemviews-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kitemviews-5.90.0.tar.xz";
+ sha256 = "10s285vxaaxjcy3am4bvch5wd7wv64wwcjvj7lqk2866aql9hmzp";
+ name = "kitemviews-5.90.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kjobwidgets-5.89.0.tar.xz";
- sha256 = "02ysdzn25a9lms70fawnz3h5vdxy9p528qmbxslsnpz29r5h2wb8";
- name = "kjobwidgets-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kjobwidgets-5.90.0.tar.xz";
+ sha256 = "1jv3c68mlsxhnd6jgqw5d4qqd66jf8bh6zbcs6bq0bad52ad2r8d";
+ name = "kjobwidgets-5.90.0.tar.xz";
};
};
kjs = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kjs-5.89.0.tar.xz";
- sha256 = "0yxk4qwl4cxv3kklvla5q3xx2vgj4lwp4pb3bplkkbighm01naih";
- name = "kjs-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kjs-5.90.0.tar.xz";
+ sha256 = "1z5d1ixzvaq6x9x0jhmh5bdrdqpsl1x7mh3s8wnycfxwmln6bawv";
+ name = "kjs-5.90.0.tar.xz";
};
};
kjsembed = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kjsembed-5.89.0.tar.xz";
- sha256 = "08ajxgh1lfbx8nf4vsljzcwkfjih8fyqp9nr2xbv2a9dbv51x1sf";
- name = "kjsembed-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kjsembed-5.90.0.tar.xz";
+ sha256 = "0ydrsg7z1b5hkskjvkb0b9lhx60aqcby2alhfbmkac197sf2frn4";
+ name = "kjsembed-5.90.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kmediaplayer-5.89.0.tar.xz";
- sha256 = "0hf44hij1bqcfvxhs7ka00habgh3lc39xajnblpm9br8xybgkaz0";
- name = "kmediaplayer-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kmediaplayer-5.90.0.tar.xz";
+ sha256 = "010m5qrn41hcxsmxsq72m83qxikfvn3mgibkgy4bn2x8kxibzmlq";
+ name = "kmediaplayer-5.90.0.tar.xz";
};
};
knewstuff = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/knewstuff-5.89.0.tar.xz";
- sha256 = "1qw3lm4vjxal7r314y0zqj59fmzj4b9z2dsd10r3mxpiwjra0s45";
- name = "knewstuff-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/knewstuff-5.90.0.tar.xz";
+ sha256 = "0q30p7z5zg3p24gp8q83i7my5bg4yfcdwsblmhl230kih8aap2cg";
+ name = "knewstuff-5.90.0.tar.xz";
};
};
knotifications = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/knotifications-5.89.0.tar.xz";
- sha256 = "1jghpawqp0zy1scs2l0dqz2sqv4xd65xiavabpjwhycx5pxpvbhs";
- name = "knotifications-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/knotifications-5.90.0.tar.xz";
+ sha256 = "15qb3jh5y1z84dp6wddwid4bk3ks05knkxlwv79hb9cdj8m4m7gi";
+ name = "knotifications-5.90.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/knotifyconfig-5.89.0.tar.xz";
- sha256 = "041qnnxhsi35xygyzlppvpghfd8fxraas824dz7rfjiym2zid7jh";
- name = "knotifyconfig-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/knotifyconfig-5.90.0.tar.xz";
+ sha256 = "1qss40sr7az9x4yvl59mblzzgjm3hd8nvxgqmqlylargvggw496c";
+ name = "knotifyconfig-5.90.0.tar.xz";
};
};
kpackage = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kpackage-5.89.0.tar.xz";
- sha256 = "198n0gr2v9r11ml2vkx9xazxf3rbw3qgc44l7x134rpn1jv9b0s3";
- name = "kpackage-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kpackage-5.90.0.tar.xz";
+ sha256 = "1rig9aws8530sav0pmginqmdcrnz10qjbxfc5lw6mmb3sfig53z0";
+ name = "kpackage-5.90.0.tar.xz";
};
};
kparts = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kparts-5.89.0.tar.xz";
- sha256 = "0vdz1sxqkx2nynlsywyp8j2ciq226cs40c3m70lqs0j5w283i5ra";
- name = "kparts-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kparts-5.90.0.tar.xz";
+ sha256 = "1x8kxd8kgzabd9dyqx2yx1qrrzl1mms4hm3lyg3f1nxki7xl6ra2";
+ name = "kparts-5.90.0.tar.xz";
};
};
kpeople = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kpeople-5.89.0.tar.xz";
- sha256 = "12bry15lr7xpgmfgpw1mdd805n1af6050vaa3pk4mbf0vc6clg5y";
- name = "kpeople-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kpeople-5.90.0.tar.xz";
+ sha256 = "1632k365bn9n3n8babq620v0px2hmapk8fprx28xpfp27zakhfgw";
+ name = "kpeople-5.90.0.tar.xz";
};
};
kplotting = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kplotting-5.89.0.tar.xz";
- sha256 = "1asqzv5jl2nb9ml5vwlpcsi9f2vw7y8rcihlvkf569s7kxsrswns";
- name = "kplotting-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kplotting-5.90.0.tar.xz";
+ sha256 = "0i5ganvpzkpkd2p1avw0fpbp3mgbbifg8mmpvdf28ayh75dvrh9y";
+ name = "kplotting-5.90.0.tar.xz";
};
};
kpty = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kpty-5.89.0.tar.xz";
- sha256 = "0053sx30d1w2m03wqv3mhkjrxdf7ps1xj8h74fv0a0clf9ab0i4x";
- name = "kpty-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kpty-5.90.0.tar.xz";
+ sha256 = "1p5ny9ry0wwwprhpj9s9xg96h9476rldly7mawvfp5q3ihys8c4a";
+ name = "kpty-5.90.0.tar.xz";
};
};
kquickcharts = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kquickcharts-5.89.0.tar.xz";
- sha256 = "05syj1162j1zhg9wws81kk9z2ri3jvlvnq95l3gv29zf582j7h91";
- name = "kquickcharts-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kquickcharts-5.90.0.tar.xz";
+ sha256 = "1vf9vwrb03z6f19xyc1dc50s3kz21s4mkrv85mmyia0by4qvq5fi";
+ name = "kquickcharts-5.90.0.tar.xz";
};
};
kross = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kross-5.89.0.tar.xz";
- sha256 = "0j88ikhxypyy4yickcz3hcdfaj8g7qjinf5va7g5ghzjar7q9x4y";
- name = "kross-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kross-5.90.0.tar.xz";
+ sha256 = "1gs7h03j753pq78q0fmajgd5pw8j3mc105rsph1c22l23vccya3z";
+ name = "kross-5.90.0.tar.xz";
};
};
krunner = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/krunner-5.89.0.tar.xz";
- sha256 = "11wzn33k6gwfiwc6idhsr8fj441c82bbzz8bx8i228ymvnqrdcqx";
- name = "krunner-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/krunner-5.90.0.tar.xz";
+ sha256 = "1q3hsml5274v8dy8rnqpnwxliad2q7a8mbs8k6kpqzih9z94crgi";
+ name = "krunner-5.90.0.tar.xz";
};
};
kservice = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kservice-5.89.0.tar.xz";
- sha256 = "0srbjazz302w7zsxh5zcq5zhgz8ad09zxld1rpfkyxg5z820lrq5";
- name = "kservice-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kservice-5.90.0.tar.xz";
+ sha256 = "121y8bbq3m4pv5m9pj753v2nk914216a86ksmdqbgffw217qckdd";
+ name = "kservice-5.90.0.tar.xz";
};
};
ktexteditor = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/ktexteditor-5.89.0.tar.xz";
- sha256 = "02bg84dmqadjlwfmccviz0d0wj0qf9fy2i9igq4mv150hqy93bb7";
- name = "ktexteditor-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/ktexteditor-5.90.0.tar.xz";
+ sha256 = "1g1dky9bgr2zjr0rw9c730shz588ykyw7qw3sgf0dr3sh8aq222n";
+ name = "ktexteditor-5.90.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/ktextwidgets-5.89.0.tar.xz";
- sha256 = "0yz2y111hjs1zq1f8887sn334gpf0sv4lrfq3i5dj0x3vcjgmccl";
- name = "ktextwidgets-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/ktextwidgets-5.90.0.tar.xz";
+ sha256 = "02g85zahh6hfsw3fcac7hp8kv4d1ha2asmmhnknqd054yl0adxjg";
+ name = "ktextwidgets-5.90.0.tar.xz";
};
};
kunitconversion = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kunitconversion-5.89.0.tar.xz";
- sha256 = "1bmnlcsi8qbba38ywr3f4vd7kddiwzmrnn9n69c6626jg4aj3g1q";
- name = "kunitconversion-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kunitconversion-5.90.0.tar.xz";
+ sha256 = "1vrvbsd8limfsmgjcv5kvzyf7g62rv1a0rvbdyq15z23zf4rsmf3";
+ name = "kunitconversion-5.90.0.tar.xz";
};
};
kwallet = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kwallet-5.89.0.tar.xz";
- sha256 = "1yy34asal5jni78jxywddh3hjpzsr1myck0f89h78a2zc28xnd1h";
- name = "kwallet-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kwallet-5.90.0.tar.xz";
+ sha256 = "06ffg84jvrc8xhymg1g5j311vq3ajfqg3arx2cxa98aqld213akl";
+ name = "kwallet-5.90.0.tar.xz";
};
};
kwayland = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kwayland-5.89.0.tar.xz";
- sha256 = "1sq4zy9bifbqlg8s3af2vwxyyg84kmxfyvdi479cn46vdavylp2j";
- name = "kwayland-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kwayland-5.90.0.tar.xz";
+ sha256 = "0n7f4rx695q889j8g4sdpdi3jhk29z8zc4wrk5srs2diqi4y0qqi";
+ name = "kwayland-5.90.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kwidgetsaddons-5.89.0.tar.xz";
- sha256 = "1rs30ialmrhwvxah6rvzbavjnp4ziaaf0j0jcm63kyqbb5nywgmk";
- name = "kwidgetsaddons-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kwidgetsaddons-5.90.0.tar.xz";
+ sha256 = "1c17iq0q2w80p7v7k32db0pc5sbzqhvh0w5d145a1nkgr3nbnk6a";
+ name = "kwidgetsaddons-5.90.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kwindowsystem-5.89.0.tar.xz";
- sha256 = "1h0v72mb7s36ggw8nv70rpk16q0cflbhgvqwzlfqvh68kbs35a4q";
- name = "kwindowsystem-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kwindowsystem-5.90.0.tar.xz";
+ sha256 = "0fj7a86dk833ld76c3b1s4ri47bhpvjsi6ryfgdv5q7h2fwh6ia5";
+ name = "kwindowsystem-5.90.0.tar.xz";
};
};
kxmlgui = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/kxmlgui-5.89.0.tar.xz";
- sha256 = "0mjfg0hd9rswz3jpmc8xjw5jqgip58cx3bavijdlnp7pla7r7j56";
- name = "kxmlgui-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/kxmlgui-5.90.0.tar.xz";
+ sha256 = "1q8v1wrx67c37jnd874ilkk8kfk3zvf3f86qg51k16ml0nrwjysg";
+ name = "kxmlgui-5.90.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/portingAids/kxmlrpcclient-5.89.0.tar.xz";
- sha256 = "0ri3z76r1v1vfp3j0mrpvan6jzmp57a5g4vwshv4zgyvr484qhlp";
- name = "kxmlrpcclient-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/portingAids/kxmlrpcclient-5.90.0.tar.xz";
+ sha256 = "0mq2wgi4qnvscjdkis7jhs004k3s1b3wg0vijjai7xzy772kvclc";
+ name = "kxmlrpcclient-5.90.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/modemmanager-qt-5.89.0.tar.xz";
- sha256 = "1sam8cr638h9gyp60dhgmrpddy6y7waf9xaij46kvc0xdan501fi";
- name = "modemmanager-qt-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/modemmanager-qt-5.90.0.tar.xz";
+ sha256 = "08nlvg5lwvl3rspi848gp2b2b5pki6sy8c3ww9nn4afy4lk7p609";
+ name = "modemmanager-qt-5.90.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/networkmanager-qt-5.89.0.tar.xz";
- sha256 = "1x1pxsf4dm8h0bj6my9rg2j95nnn81919fv9apvqglf6i3xd2pq4";
- name = "networkmanager-qt-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/networkmanager-qt-5.90.0.tar.xz";
+ sha256 = "0i9wvrxbkbil21zndiq4cmnldbqsrdp9gnhmp2ns78xdih8wysa7";
+ name = "networkmanager-qt-5.90.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/oxygen-icons5-5.89.0.tar.xz";
- sha256 = "1gmx2k5hqfa0lap2y9sv7csi09s8nl3rvab5nz731wr3s9m2frpr";
- name = "oxygen-icons5-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/oxygen-icons5-5.90.0.tar.xz";
+ sha256 = "1izfh6cxivmwiymy7lwbmf9j1hxy2skv6z1lbjr0c4snmx6pqx1g";
+ name = "oxygen-icons5-5.90.0.tar.xz";
};
};
plasma-framework = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/plasma-framework-5.89.0.tar.xz";
- sha256 = "0wx6a3agplfmf2p86ljhgd3pjx7f15g1hp660i62zw84zvpsh2dp";
- name = "plasma-framework-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/plasma-framework-5.90.0.tar.xz";
+ sha256 = "1msqjnwvb815kii0rjhn1lvsnvq5wr8iprdjzsviw67va6gaz4p1";
+ name = "plasma-framework-5.90.0.tar.xz";
};
};
prison = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/prison-5.89.0.tar.xz";
- sha256 = "0jd3qfj5k4fxqpbkjpr81mvni9kqppcq0gn5yyc9nys4wk4nr934";
- name = "prison-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/prison-5.90.0.tar.xz";
+ sha256 = "0z2k2hyjj86va5rqgd8qrvhflfppcl2d3f9smxb5w9pp19ashvyk";
+ name = "prison-5.90.0.tar.xz";
};
};
purpose = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/purpose-5.89.0.tar.xz";
- sha256 = "1sfhwzw1ghr1yg4fkrz0r2myd5569mscsr98pnc3plr78ppq9lwy";
- name = "purpose-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/purpose-5.90.0.tar.xz";
+ sha256 = "182196hj3mdy1k7wfgadfxy7m1kbqzk6kksn7yd681h2gpky82l1";
+ name = "purpose-5.90.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/qqc2-desktop-style-5.89.0.tar.xz";
- sha256 = "1q2y0hb69f3ldaslbpw8v0xapchqndjp4wzgmghd1zqab8lqjl5c";
- name = "qqc2-desktop-style-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/qqc2-desktop-style-5.90.0.tar.xz";
+ sha256 = "05g1rydx0innmiz28mslix4bjsrhsnci227gadngzijncp2v288r";
+ name = "qqc2-desktop-style-5.90.0.tar.xz";
};
};
solid = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/solid-5.89.0.tar.xz";
- sha256 = "1gy8ddg5803fpdifg68gkjrl9l2dwjrmwyzq5jzsfr6yabcfih93";
- name = "solid-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/solid-5.90.0.tar.xz";
+ sha256 = "10hk4mh426dhi7is5hxa1varn15ijzra5a420zk297pzkphvx0ip";
+ name = "solid-5.90.0.tar.xz";
};
};
sonnet = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/sonnet-5.89.0.tar.xz";
- sha256 = "0fdkx68hyp5fq0fyfbq0691vcx70qm7md2nd4028gmpcbxxaixa1";
- name = "sonnet-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/sonnet-5.90.0.tar.xz";
+ sha256 = "0d4xxm9vw1rc2mypv4z0yihcn679sab0afxr2kbzq01wr6p759y7";
+ name = "sonnet-5.90.0.tar.xz";
};
};
syndication = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/syndication-5.89.0.tar.xz";
- sha256 = "186dw32jhgfwz7dz9payx645gvhgzcf6qy5qiad6ifkvda50g9cw";
- name = "syndication-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/syndication-5.90.0.tar.xz";
+ sha256 = "0a9j443w42jwvlzjh5mfxn25kwjrz1ya6sgy0c4y3n5xbg031zmx";
+ name = "syndication-5.90.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/syntax-highlighting-5.89.0.tar.xz";
- sha256 = "0iy9ryjf6bcxwp9kni00p82mx1bg101z8331ykixffn41vfgxb9a";
- name = "syntax-highlighting-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/syntax-highlighting-5.90.0.tar.xz";
+ sha256 = "19mckdfdxb5i26y75cgmda91s864jbh1wmf98bv8xa1iqxwkwj5z";
+ name = "syntax-highlighting-5.90.0.tar.xz";
};
};
threadweaver = {
- version = "5.89.0";
+ version = "5.90.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.89/threadweaver-5.89.0.tar.xz";
- sha256 = "03yrlp9ixfb3wsrfmgxfhryzy2jsfnk4wnphmlk5nh98nxa9706x";
- name = "threadweaver-5.89.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.90/threadweaver-5.90.0.tar.xz";
+ sha256 = "1frhzlzmnrp5y3lrl0ahzxh8syj4vlkjvaypsmbm2bkkn4akizg3";
+ name = "threadweaver-5.90.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch
deleted file mode 100644
index 0f33815b6e91..000000000000
--- a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 Mon Sep 17 00:00:00 2001
-From: TBK
-Date: Wed, 26 Feb 2020 21:12:45 +0100
-Subject: [PATCH] Fix Linux build error with musl libc
-
-Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure
-on non-glibc Linux build environments. Change the conditionalization
-so that __GLIBC_PREREQ will only be used if it is defined.
-
-[ghudson@mit.edu: simplified conditionals; rewrote commit message]
-
-ticket: 8880 (new)
-tags: pullup
-target_version: 1.18-next
----
- src/util/support/plugins.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
-index 3329db7dc3..1644d16fd0 100644
---- a/src/util/support/plugins.c
-+++ b/src/util/support/plugins.c
-@@ -62,8 +62,7 @@
- * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects
- * anyway.
- */
--#ifdef __linux__
--#include
-+#ifdef __GLIBC__PREREQ
- #if ! __GLIBC_PREREQ(2, 25)
- #define dlclose(x)
- #endif
diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch
deleted file mode 100644
index f8718606a7f8..000000000000
--- a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b009cca2026b615ef5386faa4c0230bc27c4161d Mon Sep 17 00:00:00 2001
-From: Greg Hudson
-Date: Thu, 12 Mar 2020 00:44:10 -0400
-Subject: [PATCH] Fix typo in musl build fix
-
-Commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 checked for
-__GLIBC__PREREQ instead of __GLIBC_PREREQ, thus accidentally reverting
-the workaround introduced in commit
-bf5953c549a6d279977df69ffe89b2ba51460eaf. Fix the typo.
-
-ticket: 8880
----
- src/util/support/plugins.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
-index 1644d16fd0..1ff10c354d 100644
---- a/src/util/support/plugins.c
-+++ b/src/util/support/plugins.c
-@@ -62,7 +62,7 @@
- * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects
- * anyway.
- */
--#ifdef __GLIBC__PREREQ
-+#ifdef __GLIBC_PREREQ
- #if ! __GLIBC_PREREQ(2, 25)
- #define dlclose(x)
- #endif
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index ebec5936b541..c632c2fdac9e 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -19,23 +19,13 @@ in
with lib;
stdenv.mkDerivation rec {
name = "${type}krb5-${version}";
- majorVersion = "1.18"; # remove patches below with next upgrade
- version = majorVersion;
+ version = "1.19.2";
src = fetchurl {
- url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
- sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk";
+ url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz";
+ sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h";
};
- patches = optionals stdenv.hostPlatform.isMusl [
- # TODO: Remove with next release > 1.18
- # Patches to fix musl build with 1.18.
- # Not using `fetchpatch` for these for now to avoid infinite recursion
- # errors in downstream projects (unclear if it's a nixpkgs issue so far).
- ./krb5-Fix-Linux-build-error-with-musl-libc.patch
- ./krb5-Fix-typo-in-musl-build-fix.patch
- ];
-
outputs = [ "out" "dev" ];
configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index b0c02eaa6bcf..73277d30de3c 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,15 +1,14 @@
-{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }:
+{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }:
stdenv.mkDerivation rec {
pname = "libcangjie";
version = "1.4_rev_${rev}";
rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
- src = fetchFromGitLab {
- owner = "Cangjians";
- repo = "libcangjie";
- inherit rev;
- sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw=";
+ # fetchFromGitLab isn't working for some reason
+ src = fetchurl {
+ url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz";
+ sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 63015fdf6cb3..6da4c9a53a5b 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libgphoto2";
- version = "2.5.27";
+ version = "2.5.28";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
- sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg=";
+ sha256 = "sha256-e3zMinUUBKzZlQQzkS0oPWAzIVlmQoLj73Spj0XiTIE=";
};
depsBuildBuild = [ pkg-config ];
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 909ee73e69a6..f4a1959a512c 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "libical";
- version = "3.0.10";
+ version = "3.0.11";
outputs = [ "out" "dev" ]; # "devdoc" ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "libical";
repo = "libical";
rev = "v${version}";
- sha256 = "sha256-fLmEJlkZLYLcKZqZwitf8rH261QDPTJZf/+/+FMsGIg=";
+ sha256 = "sha256-9kMYqWITZ2LlBDebJUZFWyVclAjfIZtc3Dm7lii9ZMc=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 54843486e137..89bdc15ff62c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,47 +1,71 @@
-{ lib, stdenv, fetchurl, pkg-config, meson, ninja
-, libevdev, mtdev, udev, libwacom
-, documentationSupport ? false, doxygen, graphviz # Documentation
-, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support
-, testsSupport ? false, check, valgrind, python3
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, meson
+, ninja
+, libevdev
+, mtdev
+, udev
+, libwacom
+, documentationSupport ? false
+, doxygen
+, graphviz
+, runCommand
+, eventGUISupport ? false
+, cairo
+, glib
+, gtk3
+, testsSupport ? false
+, check
+, valgrind
+, python3
, nixosTests
}:
let
mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}";
- sphinx-build = if documentationSupport then
- python3.pkgs.sphinx.overrideAttrs (super: {
- propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]);
-
- postFixup = super.postFixup or "" + ''
- # Do not propagate Python
- rm $out/nix-support/propagated-build-inputs
- '';
- })
- else null;
+ sphinx-build =
+ let
+ env = python3.withPackages (pp: with pp; [
+ sphinx
+ recommonmark
+ sphinx_rtd_theme
+ ]);
+ in
+ # Expose only the sphinx-build binary to avoid contaminating
+ # everything with Sphinx’s Python environment.
+ runCommand "sphinx-build" { } ''
+ mkdir -p "$out/bin"
+ ln -s "${env}/bin/sphinx-build" "$out/bin"
+ '';
in
stdenv.mkDerivation rec {
pname = "libinput";
- version = "1.19.1";
-
- src = fetchurl {
- url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz";
- sha256 = "sha256-C9z1sXg7c3hUt68coi32e8Nqb+fJz6cfAekUn5IgRG0=";
- };
+ version = "1.19.3";
outputs = [ "bin" "out" "dev" ];
- mesonFlags = [
- (mkFlag documentationSupport "documentation")
- (mkFlag eventGUISupport "debug-gui")
- (mkFlag testsSupport "tests")
- "--sysconfdir=/etc"
- "--libexecdir=${placeholder "bin"}/libexec"
+ src = fetchurl {
+ url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz";
+ sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg=";
+ };
+
+ patches = [
+ ./udev-absolute-path.patch
];
- nativeBuildInputs = [ pkg-config meson ninja ]
- ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ];
+ nativeBuildInputs = [
+ pkg-config
+ meson
+ ninja
+ ] ++ lib.optionals documentationSupport [
+ doxygen
+ graphviz
+ sphinx-build
+ ];
buildInputs = [
libevdev
@@ -53,20 +77,34 @@ stdenv.mkDerivation rec {
pyyaml
setuptools
]))
- ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ];
+ ] ++ lib.optionals eventGUISupport [
+ # GUI event viewer
+ cairo
+ glib
+ gtk3
+ ];
+
+ propagatedBuildInputs = [
+ udev
+ ];
checkInputs = [
check
valgrind
];
- propagatedBuildInputs = [ udev ];
+ mesonFlags = [
+ (mkFlag documentationSupport "documentation")
+ (mkFlag eventGUISupport "debug-gui")
+ (mkFlag testsSupport "tests")
+ "--sysconfdir=/etc"
+ "--libexecdir=${placeholder "bin"}/libexec"
+ ];
- patches = [ ./udev-absolute-path.patch ];
+ doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform;
postPatch = ''
patchShebangs \
- tools/helper-copy-and-exec-from-tmp.sh \
test/symbols-leak-test \
test/check-leftover-udev-rules.sh \
test/helper-copy-and-exec-from-tmp.sh
@@ -75,17 +113,15 @@ stdenv.mkDerivation rec {
sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build
'';
- doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform;
-
passthru.tests = {
libinput-module = nixosTests.libinput;
};
meta = with lib; {
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
- homepage = "https://www.freedesktop.org/wiki/Software/libinput/";
- license = licenses.mit;
- platforms = platforms.unix;
- maintainers = with maintainers; [ codyopel ];
+ homepage = "https://www.freedesktop.org/wiki/Software/libinput/";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members;
};
}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 8b1213e6377e..6d9de1856237 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "librsvg";
- version = "2.52.4";
+ version = "2.52.5";
outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "Zg7Ig2o6kVh7yThJIBMtTDjR0XGMZ/4WDFIT/k3sKSg=";
+ sha256 = "QHy7q1GBN+oYo/MiC+oYD77nXz5b1roQp6hiwab3TYI=";
};
cargoVendorDir = "vendor";
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index b00b4cf9ac85..e2dc63609c41 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- version = "0.13.0";
+ version = "0.13.1";
pname = "liburcu";
src = fetchurl {
url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
- sha256 = "sha256-y7INvhqJLCpNiJi6xDFhduWFOSaT1Jh2bMu8aM8guiA=";
+ sha256 = "sha256-MhPzPSuPcQ65IOsauyeewEv4rmNh9E8lE8KMINM2MIM=";
};
checkInputs = [ perl ];
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 29531a299966..d3e3187bf757 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -1,21 +1,15 @@
{ lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
-let
- sourceInfo = rec {
- version="1.1.0";
- name="liquidfun-${version}";
- url="https://github.com/google/liquidfun/releases/download/v${version}/${name}";
- hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
- };
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+ pname = "liquidfun";
+ version = "1.1.0";
+
src = requireFile {
- url = sourceInfo.url;
- sha256 = sourceInfo.hash;
- name = sourceInfo.name + ".tar.gz";
+ url = "https://github.com/google/liquidfun/releases/download/v${version}/liquidfun-${version}";
+ sha256 = "5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86";
+ name = "liquidfun-${version}.tar.gz";
};
- inherit (sourceInfo) name version;
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU libGL libX11 libXi ];
@@ -34,15 +28,12 @@ stdenv.mkDerivation {
cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
'';
- meta = {
+ meta = with lib; {
description = "2D physics engine based on Box2D";
- maintainers = with lib.maintainers;
- [
- qknight
- ];
- platforms = lib.platforms.linux;
- hydraPlatforms = [];
- license = lib.licenses.bsd2;
+ maintainers = with maintainers; [ qknight ];
+ platforms = platforms.linux;
+ hydraPlatforms = [ ];
+ license = licenses.bsd2;
homepage = "https://google.github.io/liquidfun/";
};
}
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index a4f0289cd58e..b73289ca82ff 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
-, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif
+, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
, gtk2, genericUpdater, common-updater-scripts, libebur128
, jack2, ladspa-sdk, swig, which, ncurses
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev
+ SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev
movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2
ladspa-sdk
] ++ lib.optional enablePython ncurses;
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 6c97b37a25fe..efab246bb1f0 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
"--enable-symlinks"
"--with-manpage-format=normal"
"--disable-stripping"
+ "--with-versioned-syms"
] ++ lib.optional unicodeSupport "--enable-widec"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index d28f7b25792e..d2cdebdf3553 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -23,9 +23,12 @@ stdenv.mkDerivation rec {
--replace "@OUT@" $out
'';
+ strictDeps = true;
+
nativeBuildInputs = [ cmake ];
- buildInputs = lib.optional alsaSupport alsa-lib
+ buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc
+ ++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio
++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 34a3788d7860..df6e364d2e9a 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,34 +1,61 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, which
-, gettext, libffi, libiconv, libtasn1
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, docbook-xsl-nons
+, gtk-doc
+, installShellFiles
+, libxslt # for xsltproc
+, pkg-config
+, which
+, libffi
+, libiconv
+, libintl
+, libtasn1
}:
stdenv.mkDerivation rec {
pname = "p11-kit";
- version = "0.24.0";
+ version = "0.24.1";
src = fetchFromGitHub {
owner = "p11-glue";
repo = pname;
rev = version;
- sha256 = "sha256-jvUzOhMvbq05SxQ+kjKQHDDMzNwo4U6nFHu3JjygJHw=";
+ hash = "sha256-1QIMEGBZsqLYU3v5ZswD5K9VcIGLBovJlC10lBHhH7c=";
};
- outputs = [ "out" "dev"];
- outputBin = "dev";
+ outputs = [ "out" "bin" "dev"];
- # for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs
+ # For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs
# provides the asn1Parser binary on the hostPlatform needed for building.
# at the same time, libtasn1 in buildInputs provides the libasn1 library
# to link against for the target platform.
- # hence, libtasn1 is required in both native and build inputs.
- nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ];
- buildInputs = [ gettext libffi libiconv libtasn1 ];
+ # Hence, libtasn1 is required in both native and build inputs.
+ nativeBuildInputs = [
+ autoreconfHook
+ docbook-xsl-nons
+ gtk-doc
+ installShellFiles
+ libtasn1
+ libxslt.bin
+ pkg-config
+ which
+ ];
+
+ buildInputs = [
+ libffi
+ libiconv
+ libintl
+ libtasn1
+ ];
autoreconfPhase = ''
NOCONFIGURE=1 ./autogen.sh
'';
configureFlags = [
+ "--enable-doc"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-trust-paths=${lib.concatStringsSep ":" [
@@ -53,6 +80,10 @@ stdenv.mkDerivation rec {
"exampledir=${placeholder "out"}/etc/pkcs11"
];
+ postInstall = ''
+ installShellCompletion --bash bash-completion/{p11-kit,trust}
+ '';
+
meta = with lib; {
description = "Library for loading and sharing PKCS#11 modules";
longDescription = ''
@@ -61,6 +92,10 @@ stdenv.mkDerivation rec {
PKCS#11 modules in such a way that they're discoverable.
'';
homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html";
+ changelog = [
+ "https://github.com/p11-glue/p11-kit/raw/${version}/NEWS"
+ "https://github.com/p11-glue/p11-kit/releases/tag/${version}"
+ ];
platforms = platforms.all;
license = licenses.bsd3;
};
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 724a1b1247a2..8393cb8c5910 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -5,10 +5,10 @@
stdenv.mkDerivation rec {
pname = "pcre2";
- version = "10.37";
+ version = "10.39";
src = fetchurl {
url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2";
- hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA=";
+ hash = "sha256-DwPK9X+B2f82KsKM04nAVewr8GeNJ3NJoaS+4ArW1EA=";
};
# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
diff --git a/pkgs/development/libraries/protobuf/3.16.nix b/pkgs/development/libraries/protobuf/3.16.nix
index df8d53b9f1c3..fdbbed733d85 100644
--- a/pkgs/development/libraries/protobuf/3.16.nix
+++ b/pkgs/development/libraries/protobuf/3.16.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
- version = "3.16.0";
- sha256 = "0jc523ys6xh1fk3l52f5mfqxhb4g8aim1js7330v0fdc3fjr8ncf";
+ version = "3.16.1";
+ sha256 = "sha256-eOwUyZtrmyh3HwLQ1kLnk+briaXQPrlUqtbFol/nGBo=";
}
diff --git a/pkgs/development/libraries/protobuf/3.18.nix b/pkgs/development/libraries/protobuf/3.18.nix
index 63fc9b218d30..0d5d2c652cba 100644
--- a/pkgs/development/libraries/protobuf/3.18.nix
+++ b/pkgs/development/libraries/protobuf/3.18.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
- version = "3.18.1";
- sha256 = "sha256-5PK0uuk7Du9hX/hHy0gninHIKu6b8THdfVh87Gn7y2Q=";
+ version = "3.18.2";
+ sha256 = "sha256-IXxVTZOAKVMuGCJtD32rVQRBJRWUJMEK2d+fPEmgzRU=";
}
diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix
index 727bf511d581..7e2be4bec04c 100644
--- a/pkgs/development/libraries/protobuf/3.19.nix
+++ b/pkgs/development/libraries/protobuf/3.19.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
- version = "3.19.0";
- sha256 = "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g";
+ version = "3.19.3";
+ sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ=";
}
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
index 6bff5998b56d..1e35ab700a08 100644
--- a/pkgs/development/libraries/protozero/default.nix
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "protozero";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "mapbox";
repo = "protozero";
rev = "v${version}";
- sha256 = "0fdihfl5j68wayjjxvpvhvnjq1anzcfnfl09f68wpzbkg3zmhblz";
+ sha256 = "sha256-R8lGewsEOxPNbKlkIeiM4yIwUcTzi2Dm0+xJ2WrBTBQ=";
};
nativeBuildInputs = [ cmake ];
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
description = "Minimalistic protocol buffer decoder and encoder in C++";
homepage = "https://github.com/mapbox/protozero";
license = with licenses; [ bsd2 asl20 ];
+ changelog = [
+ "https://github.com/mapbox/protozero/releases/tag/v${version}"
+ "https://github.com/mapbox/protozero/blob/v${version}/CHANGELOG.md"
+ ];
maintainers = with maintainers; [ das-g ];
};
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 68945625f5b4..01d0c5932828 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -19,7 +19,7 @@
, ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit
, ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication
, cups, openbsm, runCommand, xcbuild, writeScriptBin
-, ffmpeg ? null
+, ffmpeg_4 ? null
, lib, stdenv, fetchpatch
, version ? null
, qtCompatVersion
@@ -115,6 +115,7 @@ qtModule {
] ++ lib.optionals stdenv.isDarwin [
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
+ "-Wno-elaborated-enum-base"
#
# Prevent errors like
@@ -153,7 +154,7 @@ qtModule {
harfbuzz icu
libevent
- ffmpeg
+ ffmpeg_4
] ++ lib.optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp
diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix
index 35a37fbddb86..395e5d0c75d6 100644
--- a/pkgs/development/libraries/s2n-tls/default.nix
+++ b/pkgs/development/libraries/s2n-tls/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
- version = "1.3.0";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU=";
+ hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index ee0f6be16984..4f639cf29f74 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -46,6 +46,12 @@ stdenv.mkDerivation rec {
postPatch = ''
install ${doxygen_sh} doxygen.sh
patchShebangs build-aux
+
+ # https://gitlab.freedesktop.org/spice/spice-common/-/issues/5
+ substituteInPlace subprojects/spice-common/meson.build \
+ --replace \
+ "cmd = run_command(python, '-m', module)" \
+ "cmd = run_command(python, '-c', 'import @0@'.format(module))"
'';
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix
index 49c761231015..c74780148a1b 100644
--- a/pkgs/development/libraries/srt/default.nix
+++ b/pkgs/development/libraries/srt/default.nix
@@ -4,13 +4,13 @@
with lib;
stdenv.mkDerivation rec {
pname = "srt";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "Haivision";
repo = "srt";
rev = "v${version}";
- sha256 = "1f60vlfxhh9bhafws82c3301whjlz5gy92jz9a9ymwfg5h53bv1j";
+ sha256 = "sha256-OfcMHH+MSOGY9pxpXt19EIGdP4FJFssSv/lENX+iIf8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index febf1b97eb68..f040022cc91b 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "tdb";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchurl {
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
- sha256 = "sha256-vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE=";
+ sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index d2a953839982..68a29919f0aa 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
python3 # for data-generators
systemd # used for checks to install systemd user service
dbus # used for checks and pkg-config to install dbus service/s
- ];
+ ] ++ checkInputs; # gi is in the main meson.build and checked regardless of
+ # whether tests are enabled
buildInputs = [
glib
@@ -85,7 +86,6 @@ stdenv.mkDerivation rec {
checkInputs = with python3.pkgs; [
pygobject3
- tappy
];
mesonFlags = [
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 73fef21eccb7..61696d232f79 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wayland-protocols";
- version = "1.24";
+ version = "1.25";
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
- sha256 = "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z";
+ sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi";
};
postPatch = lib.optionalString doCheck ''
diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix
new file mode 100644
index 000000000000..1ce3c2d9fa8b
--- /dev/null
+++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl, darwin }:
+
+stdenv.mkDerivation rec {
+ pname = "webrtc-audio-processing";
+ version = "0.3.1";
+
+ src = fetchurl {
+ url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz";
+ sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
+ };
+
+ patches = [ ./enable-riscv.patch ];
+
+ buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
+
+ patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
+ substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
+ '';
+
+ meta = with lib; {
+ homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
+ description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
index 1ce3c2d9fa8b..5a53564603d8 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -1,19 +1,34 @@
-{ lib, stdenv, fetchurl, darwin }:
+{ lib, stdenv, fetchurl
+, darwin
+, abseil-cpp_202111
+, meson
+, ninja
+}:
stdenv.mkDerivation rec {
pname = "webrtc-audio-processing";
- version = "0.3.1";
+ version = "1.0";
src = fetchurl {
- url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz";
- sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
+ url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v1.0/webrtc-audio-processing-v${version}.tar.gz";
+ sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU=";
};
- patches = [ ./enable-riscv.patch ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ ];
- buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
+ buildInputs = [
+ abseil-cpp_202111
+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]);
- patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
+ patchPhase = ''
+ # this is just incorrect upstream
+ # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4
+ substituteInPlace meson.build \
+ --replace "absl_flags_registry" "absl_flags_reflection"
+ '' + lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
'';
@@ -21,6 +36,8 @@ stdenv.mkDerivation rec {
homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
license = licenses.bsd3;
- platforms = platforms.unix;
+ # attempts to inline 256bit AVX instructions on x86
+ # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5
+ platforms = lib.lists.subtractLists platforms.i686 platforms.unix;
};
}
diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix
index cf188756ffde..398a09ff2aa7 100644
--- a/pkgs/development/libraries/wlroots/0.14.nix
+++ b/pkgs/development/libraries/wlroots/0.14.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
-, libpng, ffmpeg, xcbutilrenderutil, seatd
+, libpng, ffmpeg_4, xcbutilrenderutil, seatd
, enableXWayland ? true, xwayland ? null
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
- libpng ffmpeg xcbutilrenderutil seatd
+ libpng ffmpeg_4 xcbutilrenderutil seatd
]
++ lib.optional enableXWayland xwayland
;
diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix
index e5785fab9f21..ed3effaa5405 100644
--- a/pkgs/development/libraries/wlroots/0.15.nix
+++ b/pkgs/development/libraries/wlroots/0.15.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
-, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang
+, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang
, nixosTests
, enableXWayland ? true, xwayland ? null
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
- libpng ffmpeg xcbutilrenderutil seatd vulkan-loader
+ libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader
]
++ lib.optional enableXWayland xwayland
;
diff --git a/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch
new file mode 100644
index 000000000000..ca9eb8bf612a
--- /dev/null
+++ b/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch
@@ -0,0 +1,43 @@
+commit 56a60ee50122613d3a356ce74b4bd77b5e7be235
+Author: Tim Kosse
+Date: Sat Aug 26 15:37:30 2017 +0200
+
+ If a wxTopLevelWindow has been instanced, but Create has not been called, calling Destroy on the window results in an assertion in Show(false), at least under wxGTK. Fix this by only hiding a top level window during destruction if it is actually shown.
+
+diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
+index ef693690c5..8d07812031 100644
+--- a/src/common/toplvcmn.cpp
++++ b/src/common/toplvcmn.cpp
+@@ -122,19 +122,21 @@ bool wxTopLevelWindowBase::Destroy()
+ // any more as no events will be sent to the hidden window and without idle
+ // events we won't prune wxPendingDelete list and the application won't
+ // terminate
+- for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+- end = wxTopLevelWindows.end();
+- i != end;
+- ++i )
+- {
+- wxTopLevelWindow * const win = static_cast(*i);
+- if ( win != this && win->IsShown() )
++ if ( IsShown() ) {
++ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
++ end = wxTopLevelWindows.end();
++ i != end;
++ ++i )
+ {
+- // there remains at least one other visible TLW, we can hide this
+- // one
+- Hide();
++ wxTopLevelWindow * const win = static_cast(*i);
++ if ( win != this && win->IsShown() )
++ {
++ // there remains at least one other visible TLW, we can hide this
++ // one
++ Hide();
+
+- break;
++ break;
++ }
+ }
+ }
+
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 8029477708df..bc8fc6f5b047 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -1,76 +1,117 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
-, libX11, cairo
-, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+{ lib
+, stdenv
+, fetchurl
+, cairo
+, gtk2
+, libGL
+, libGLU
+, libSM
+, libX11
+, libXinerama
+, libXxf86vm
+, pkg-config
+, xorgproto
+, compat24 ? false
+, compat26 ? true
+, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, libGLU ? null, libGL ? null
-, compat24 ? false, compat26 ? true, unicode ? true,
}:
assert withMesa -> libGLU != null && libGL != null;
-with lib;
-
stdenv.mkDerivation rec {
- version = "2.8.12.1";
pname = "wxGTK";
+ version = "2.8.12.1";
src = fetchurl {
url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2";
- sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
+ hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA=";
};
- buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]
- ++ optional withMesa libGLU;
+ nativeBuildInputs = [
+ pkg-config
+ ];
- nativeBuildInputs = [ pkg-config ];
-
- hardeningDisable = [ "format" ];
+ buildInputs = [
+ cairo
+ gtk2
+ libSM
+ libX11
+ libXinerama
+ libXxf86vm
+ xorgproto
+ ]
+ ++ lib.optional withMesa libGLU;
configureFlags = [
"--enable-gtk2"
- (if compat24 then "--enable-compat24" else "--disable-compat24")
- (if compat26 then "--enable-compat26" else "--disable-compat26")
"--disable-precomp-headers"
- (if unicode then "--enable-unicode" else "")
"--enable-mediactrl"
"--enable-graphics_ctx"
- ] ++ optional withMesa "--with-opengl";
+ (if compat24 then "--enable-compat24" else "--disable-compat24")
+ (if compat26 then "--enable-compat26" else "--disable-compat26")
+ ]
+ ++ lib.optional unicode "--enable-unicode"
+ ++ lib.optional withMesa "--with-opengl";
+
+ hardeningDisable = [ "format" ];
# These variables are used by configure to find some dependencies.
SEARCH_INCLUDE =
"${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
SEARCH_LIB =
"${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
- + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib ";
+ + lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib ";
# Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing";
- preConfigure = "
- substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
- substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
- substituteInPlace configure --replace /usr /no-such-path
- ";
+ preConfigure = ''
+ substituteInPlace configure --replace \
+ 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+ substituteInPlace configure --replace \
+ 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
+ substituteInPlace configure --replace \
+ /usr /no-such-path
+ '';
- postBuild = "(cd contrib/src && make)";
+ postBuild = ''
+ pushd contrib/src
+ make
+ popd
+ '';
- postInstall = "
- (cd contrib/src && make install)
- (cd $out/include && ln -s wx-*/* .)
- ";
+ postInstall = ''
+ pushd contrib/src
+ make install
+ popd
+ pushd $out/include
+ ln -s wx-*/* .
+ popd
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = "https://www.wxwidgets.org/";
+ description = "A Cross-Platform C++ GUI Library";
+ longDescription = ''
+ wxWidgets gives you a single, easy-to-use API for writing GUI applications
+ on multiple platforms that still utilize the native platform's controls
+ and utilities. Link with the appropriate library for your platform and
+ compiler, and your application will adopt the look and feel appropriate to
+ that platform. On top of great GUI functionality, wxWidgets gives you:
+ online help, network programming, streams, clipboard and drag and drop,
+ multithreading, image loading and saving in a variety of popular formats,
+ database support, HTML viewing and printing, and much more.
+ '';
+ license = licenses.wxWindows;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux;
+ };
passthru = {
inherit compat24 compat26 unicode;
gtk = gtk2;
};
-
- enableParallelBuilding = true;
-
- meta = {
- platforms = platforms.linux;
- license = licenses.wxWindows;
- homepage = "https://www.wxwidgets.org/";
- description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
- longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
- };
}
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix
index 5674f076beca..46ef04dcb7a1 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -1,84 +1,127 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
-, setfile
-, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoconf
+, gtk2
+, libGL
+, libGLU
+, libSM
+, libXinerama
+, libXxf86vm
+, pkg-config
+, xorgproto
+, compat24 ? false
+, compat26 ? true
+, unicode ? true
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, libGLU ? null, libGL ? null
-, compat24 ? false, compat26 ? true, unicode ? true
-, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
+, darwin
}:
assert withMesa -> libGLU != null && libGL != null;
-
-with lib;
-
+let
+ inherit (darwin.stubs) setfile;
+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
+in
stdenv.mkDerivation rec {
- pname = "wxwidgets";
- version = "2.9.4";
+ pname = "wxGTK";
+ version = "2.9.5";
- src = fetchurl {
- url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
- sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc";
+ src = fetchFromGitHub {
+ owner = "wxWidgets";
+ repo = "wxWidgets";
+ rev = "v${version}";
+ hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE=";
};
patches = [
- (fetchurl { # https://trac.wxwidgets.org/ticket/17942
- url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/"
- + "fix_assertion_using_hide_in_destroy.diff";
- sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
- })
+ # https://github.com/wxWidgets/wxWidgets/issues/17942
+ ../0001-fix-assertion-using-hide-in-destroy.patch
];
- buildInputs =
- [ gtk2 libXinerama libSM libXxf86vm xorgproto ]
- ++ optional withMesa libGLU
- ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
+ nativeBuildInputs = [
+ autoconf
+ pkg-config
+ ];
- nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ gtk2
+ libSM
+ libXinerama
+ libXxf86vm
+ xorgproto
+ ]
+ ++ lib.optional withMesa libGLU
+ ++ lib.optionals stdenv.isDarwin [
+ Carbon
+ Cocoa
+ Kernel
+ QuickTime
+ setfile
+ ];
- propagatedBuildInputs = optional stdenv.isDarwin AGL;
+ propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
- configureFlags =
- [ "--enable-gtk2" "--disable-precomp-headers"
- (if compat24 then "--enable-compat24" else "--disable-compat24")
- (if compat26 then "--enable-compat26" else "--disable-compat26") ]
- ++ optional unicode "--enable-unicode"
- ++ optional withMesa "--with-opengl"
- ++ optionals stdenv.isDarwin
- # allow building on 64-bit
- [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ];
+ configureFlags = [
+ "--disable-precomp-headers"
+ "--enable-gtk2"
+ (if compat24 then "--enable-compat24" else "--disable-compat24")
+ (if compat26 then "--enable-compat26" else "--disable-compat26")
+ ]
+ ++ lib.optional unicode "--enable-unicode"
+ ++ lib.optional withMesa "--with-opengl"
+ ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit
+ "--enable-universal-binaries"
+ "--with-cocoa"
+ "--with-macosx-version-min=10.7"
+ ];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
- preConfigure = "
- substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
- substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
- substituteInPlace configure --replace /usr /no-such-path
- " + optionalString stdenv.isDarwin ''
+ preConfigure = ''
+ ./autogen.sh
+ substituteInPlace configure --replace \
+ 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+ substituteInPlace configure --replace \
+ 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
+ substituteInPlace configure --replace \
+ /usr /no-such-path
+ '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
substituteInPlace configure --replace \
- "-framework System" \
- -lSystem
+ "-framework System" "-lSystem"
'';
- postInstall = "
- (cd $out/include && ln -s wx-*/* .)
- ";
+ postInstall = ''
+ pushd $out/include
+ ln -s wx-*/* .
+ popd
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = "https://www.wxwidgets.org/";
+ description = "A Cross-Platform C++ GUI Library";
+ longDescription = ''
+ wxWidgets gives you a single, easy-to-use API for writing GUI applications
+ on multiple platforms that still utilize the native platform's controls
+ and utilities. Link with the appropriate library for your platform and
+ compiler, and your application will adopt the look and feel appropriate to
+ that platform. On top of great GUI functionality, wxWidgets gives you:
+ online help, network programming, streams, clipboard and drag and drop,
+ multithreading, image loading and saving in a variety of popular formats,
+ database support, HTML viewing and printing, and much more.
+ '';
+ license = licenses.wxWindows;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.darwin ++ platforms.linux;
+ badPlatforms = [ "x86_64-darwin" ];
+ };
passthru = {
inherit compat24 compat26 unicode;
gtk = gtk2;
};
-
- enableParallelBuilding = true;
-
- meta = {
- platforms = with platforms; darwin ++ linux;
- license = licenses.wxWindows;
- homepage = "https://www.wxwidgets.org/";
- description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
- longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
- badPlatforms = [ "x86_64-darwin" ];
- };
}
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 30e807cde057..0469ccbd0dfb 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,20 +1,33 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config
-, libXinerama, libSM, libXxf86vm
-, gtk2, gtk3
-, xorgproto, gst_all_1, setfile
-, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, withMesa ? libGLSupported
-, libGLU, libGL
-, compat24 ? false, compat26 ? true, unicode ? true
+{ lib
+, stdenv
+, fetchFromGitHub
+, gst_all_1
+, gtk2
+, gtk3
+, libGL
+, libGLU
+, libSM
+, libXinerama
+, libXxf86vm
+, pkg-config
+, xorgproto
+, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
+, compat24 ? false
+, compat26 ? true
+, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk
-, AGL, Carbon, Cocoa, Kernel, QTKit
+, darwin
}:
-with lib;
-
-assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2.";
+assert withGtk2 -> (!withWebKit);
+let
+ inherit (darwin.stubs) setfile;
+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
+ inherit (gst_all_1) gstreamer gst-plugins-base;
+ gtk = if withGtk2 then gtk2 else gtk3;
+in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.0.5";
@@ -23,73 +36,103 @@ stdenv.mkDerivation rec {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
- sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7";
+ hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A=";
};
- nativeBuildInputs = [ pkg-config ];
-
- buildInputs = [
- libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
- ] ++ optional withGtk2 gtk2
- ++ optional (!withGtk2) gtk3
- ++ optional withMesa libGLU
- ++ optional withWebKit webkitgtk
- ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
-
- propagatedBuildInputs = optional stdenv.isDarwin AGL;
-
- patches = [
- (fetchurl { # https://trac.wxwidgets.org/ticket/17942
- url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/"
- + "fix_assertion_using_hide_in_destroy.diff";
- sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
- })
+ nativeBuildInputs = [
+ pkg-config
];
- configureFlags =
- [ "--disable-precomp-headers" "--enable-mediactrl"
- (if compat24 then "--enable-compat24" else "--disable-compat24")
- (if compat26 then "--enable-compat26" else "--disable-compat26") ]
- ++ optional unicode "--enable-unicode"
- ++ optional withMesa "--with-opengl"
- ++ optionals stdenv.isDarwin
- # allow building on 64-bit
- [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]
- ++ optionals withWebKit
- ["--enable-webview" "--enable-webview-webkit"];
+ buildInputs = [
+ gstreamer
+ gst-plugins-base
+ gtk
+ libSM
+ libXinerama
+ libXxf86vm
+ xorgproto
+ ]
+ ++ lib.optional withMesa libGLU
+ ++ lib.optional withWebKit webkitgtk
+ ++ lib.optionals stdenv.isDarwin [
+ Carbon
+ Cocoa
+ Kernel
+ QTKit
+ setfile
+ ];
+
+ propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
+
+ patches = [
+ # https://github.com/wxWidgets/wxWidgets/issues/17942
+ ../0001-fix-assertion-using-hide-in-destroy.patch
+ ];
+
+ configureFlags = [
+ "--disable-precomp-headers"
+ "--enable-mediactrl"
+ (if compat24 then "--enable-compat24" else "--disable-compat24")
+ (if compat26 then "--enable-compat26" else "--disable-compat26")
+ ]
+ ++ lib.optional unicode "--enable-unicode"
+ ++ lib.optional withMesa "--with-opengl"
+ ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit
+ "--enable-universal-binaries"
+ "--with-cocoa"
+ "--with-macosx-version-min=10.7"
+ ]
+ ++ lib.optionals withWebKit [
+ "--enable-webview"
+ "--enable-webview-webkit"
+ ];
SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib ";
- preConfigure = "
- substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
- substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
- substituteInPlace configure --replace /usr /no-such-path
- " + optionalString stdenv.isDarwin ''
+ preConfigure = ''
+ substituteInPlace configure --replace \
+ 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+ substituteInPlace configure --replace \
+ 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB='
+ substituteInPlace configure --replace \
+ /usr /no-such-path
+ '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
substituteInPlace configure --replace \
- "-framework System" \
- -lSystem
+ "-framework System" "-lSystem"
'';
- postInstall = "
- (cd $out/include && ln -s wx-*/* .)
- ";
-
- passthru = {
- inherit compat24 compat26 unicode;
- gtk = if withGtk2 then gtk2 else gtk3;
- };
+ postInstall = ''
+ pushd $out/include
+ ln -s wx-*/* .
+ popd
+ '';
enableParallelBuilding = true;
- meta = {
- platforms = with platforms; darwin ++ linux;
- license = licenses.wxWindows;
+ meta = with lib; {
homepage = "https://www.wxwidgets.org/";
- description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
- longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
+ description = "A Cross-Platform C++ GUI Library";
+ longDescription = ''
+ wxWidgets gives you a single, easy-to-use API for writing GUI applications
+ on multiple platforms that still utilize the native platform's controls
+ and utilities. Link with the appropriate library for your platform and
+ compiler, and your application will adopt the look and feel appropriate to
+ that platform. On top of great GUI functionality, wxWidgets gives you:
+ online help, network programming, streams, clipboard and drag and drop,
+ multithreading, image loading and saving in a variety of popular formats,
+ database support, HTML viewing and printing, and much more.
+ '';
+ license = licenses.wxWindows;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux ++ platforms.darwin;
badPlatforms = [ "x86_64-darwin" ];
};
+
+ passthru = {
+ inherit gtk;
+ inherit compat24 compat26 unicode;
+ };
}
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 17c2ee9efaef..e1f732929cec 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,71 +1,99 @@
-{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib
-# darwin only attributes
-, derez, rez, setfile
-, AGL, Cocoa, Kernel, WebKit
+{ lib
+, stdenv
+, fetchFromGitHub
+, expat
+, libiconv
+, libjpeg
+, libpng
+, libtiff
+, zlib
+, darwin
}:
+let
+ inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
+ inherit (darwin.stubs) derez rez setfile;
+in
stdenv.mkDerivation rec {
- version = "3.0.5.1";
pname = "wxmac";
+ version = "3.0.5.1";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
- sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
+ hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0=";
};
buildInputs = [
- expat libiconv libjpeg libpng libtiff zlib
- derez rez setfile
- AGL Cocoa Kernel WebKit
+ expat
+ libiconv
+ libjpeg
+ libpng
+ libtiff
+ zlib
+ AGL
+ Cocoa
+ Kernel
+ WebKit
+ derez
+ rez
+ setfile
];
postPatch = ''
- substituteInPlace configure --replace "-framework System" -lSystem
+ substituteInPlace configure --replace "-framework System" "-lSystem"
'';
configureFlags = [
- "wx_cv_std_libfullpath=/var/empty"
- "--with-macosx-version-min=10.7"
- "--enable-unicode"
- "--with-osx_cocoa"
- "--enable-std_string"
- "--enable-display"
- "--with-opengl"
- "--with-libjpeg"
- "--with-libtiff"
- "--without-liblzma"
- "--with-libpng"
- "--with-zlib"
- "--enable-dnd"
+ "--disable-mediactrl"
+ "--disable-precomp-headers"
"--enable-clipboard"
- "--enable-webkit"
- "--enable-svg"
- "--enable-graphics_ctx"
"--enable-controls"
"--enable-dataviewctrl"
+ "--enable-display"
+ "--enable-dnd"
+ "--enable-graphics_ctx"
+ "--enable-std_string"
+ "--enable-svg"
+ "--enable-unicode"
+ "--enable-webkit"
"--with-expat"
- "--disable-precomp-headers"
- "--disable-mediactrl"
+ "--with-libjpeg"
+ "--with-libpng"
+ "--with-libtiff"
+ "--with-macosx-version-min=10.7"
+ "--with-opengl"
+ "--with-osx_cocoa"
+ "--with-zlib"
+ "--without-liblzma"
+ "wx_cv_std_libfullpath=/var/empty"
];
+ doCheck = true;
checkPhase = ''
./wx-config --libs
'';
NIX_CFLAGS_COMPILE = "-Wno-undef";
- doCheck = true;
-
enableParallelBuilding = true;
meta = with lib; {
- platforms = platforms.darwin;
- license = licenses.wxWindows;
- maintainers = [ maintainers.lnl7 ];
homepage = "https://www.wxwidgets.org/";
- description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
- longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
+ description = "A Cross-Platform C++ GUI Library - MacOS-only build";
+ longDescription = ''
+ wxWidgets gives you a single, easy-to-use API for writing GUI applications
+ on multiple platforms that still utilize the native platform's controls
+ and utilities. Link with the appropriate library for your platform and
+ compiler, and your application will adopt the look and feel appropriate to
+ that platform. On top of great GUI functionality, wxWidgets gives you:
+ online help, network programming, streams, clipboard and drag and drop,
+ multithreading, image loading and saving in a variety of popular formats,
+ database support, HTML viewing and printing, and much more.
+ '';
+ license = licenses.wxWindows;
+ maintainers = with maintainers; [ lnl7 ];
+ platforms = platforms.darwin;
};
}
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 2c9f476313ec..dc2b1c40c6cb 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library for encoding H264/AVC video streams";
homepage = "http://www.videolan.org/developers/x264.html";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ spwhitt tadeokondrak ];
};
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 4610aa5309fb..20c56f4d9037 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,103 +1,138 @@
-{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl
-, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms
-, debugSupport ? false # Run-time sanity checks (debugging)
-, werrorSupport ? false # Warnings as errors
-, ppaSupport ? false # PPA profiling instrumentation
-, vtuneSupport ? false # Vtune profiling instrumentation
-, custatsSupport ? false # Internal profiling of encoder work
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, cmake
+, nasm
+
+# NUMA support enabled by default on NUMA platforms:
+, numaSupport ? (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64))
+, numactl
+
+# Multi bit-depth support (8bit+10bit+12bit):
+, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux))
+
+# Other options:
, cliSupport ? true # Build standalone CLI application
-, unittestsSupport ? false # Unit tests
+, custatsSupport ? false # Internal profiling of encoder work
+, debugSupport ? false # Run-time sanity checks (debugging)
+, ppaSupport ? false # PPA profiling instrumentation
+, unittestsSupport ? (stdenv.is64bit && !(stdenv.isDarwin && stdenv.isAarch64)) # Unit tests - only testing x64 assembly
+, vtuneSupport ? false # Vtune profiling instrumentation
+, werrorSupport ? false # Warnings as errors
}:
let
mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
- inherit (stdenv) is64bit;
- cmakeFlagsAll = [
- "-DSTATIC_LINK_CRT=OFF"
+ cmakeCommonFlags = [
+ "-Wno-dev"
+ (mkFlag custatsSupport "DETAILED_CU_STATS")
(mkFlag debugSupport "CHECKED_BUILD")
(mkFlag ppaSupport "ENABLE_PPA")
(mkFlag vtuneSupport "ENABLE_VTUNE")
- (mkFlag custatsSupport "DETAILED_CU_STATS")
- (mkFlag unittestsSupport "ENABLE_TESTS")
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
- ] ++ lib.optionals stdenv.hostPlatform.isPower [
- "-DENABLE_ALTIVEC=OFF"
];
- version = "3.4";
+ cmakeStaticLibFlags = [
+ "-DHIGH_BIT_DEPTH=ON"
+ "-DENABLE_CLI=OFF"
+ "-DENABLE_SHARED=OFF"
+ "-DEXPORT_C_API=OFF"
+ ] ++ lib.optionals stdenv.hostPlatform.isPower [
+ "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
+ ];
- src = fetchFromBitbucket {
- owner = "multicoreware";
- repo = "x265_git";
- rev = version;
- sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn";
- };
-
- buildLib = has12Bit: stdenv.mkDerivation rec {
- name = "libx265-${if has12Bit then "12" else "10"}-${version}";
- inherit src;
-
- postPatch = ''
- sed -i 's/unknown/${version}/g' source/cmake/version.cmake
- sed -i 's/0.0/${version}/g' source/cmake/version.cmake
- '';
-
- cmakeLibFlags = [
- "-DENABLE_CLI=OFF"
- "-DENABLE_SHARED=OFF"
- "-DENABLE_HDR10_PLUS=ON"
- "-DEXPORT_C_API=OFF"
- "-DHIGH_BIT_DEPTH=ON"
- ];
- cmakeFlags = [(mkFlag has12Bit "MAIN12")] ++ cmakeLibFlags ++ cmakeFlagsAll;
-
- preConfigure = ''
- cd source
- '';
-
- nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl;
- };
-
- libx265-10 = buildLib false;
- libx265-12 = buildLib true;
in
stdenv.mkDerivation rec {
pname = "x265";
- inherit version src;
+ version = "3.5";
+
+ outputs = [ "out" "dev" ];
+
+ # Check that x265Version.txt contains the expected version number
+ # whether we fetch a source tarball or a tag from the git repo
+ src = fetchurl {
+ url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz";
+ hash = "sha256-5wozNcrKy7oLOiDsb+zWeDkyKI68gWOtdLzJYGR3yug=";
+ };
+
+ sourceRoot = "x265_${version}/source";
+
+ patches = [
+ # More aliases for ARM platforms + do not force CLFAGS for ARM :
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/arm-r1.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
+ sha256 = "1hgzq5vxkwh0nyikxjfz8gz3jvx2nq3yy12mz3fn13qvzdlb5ilp";
+ })
+ # use proper check to avoid undefined symbols when enabling assembly on ARM :
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/neon.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
+ sha256 = "1mmshpbyldrfqxfmdajqal4l647zvlrwdai8pxw99qg4v8gajfii";
+ })
+ # More complete PPC64 matches :
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/x265-3.3-ppc64.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
+ sha256 = "1mvw678xfm0vr59n5jilq56qzcgk1gmcip2afyafkqiv21nbms8c";
+ })
+ # Namespace functions for multi-bitdepth builds so that libraries are self-contained (and tests succeeds) :
+ (fetchpatch {
+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/test-ns.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
+ sha256 = "0zg3g53l07yh7ar5c241x50y5zp7g8nh8rh63ad4bdpchpc2f52d";
+ })
+ ];
postPatch = ''
- sed -i 's/unknown/${version}/g' source/cmake/version.cmake
- sed -i 's/0.0/${version}/g' source/cmake/version.cmake
+ substituteInPlace cmake/Version.cmake \
+ --replace "unknown" "${version}" \
+ --replace "0.0" "${version}"
'';
- cmakeFlags = [
+ nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ];
+
+ # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted
+ # (we are in x265_/source/build)
+ preBuild = lib.optionalString (multibitdepthSupport) ''
+ cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags}
+ make -C ../build-10bits -j $NIX_BUILD_CORES
+ cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON
+ make -C ../build-12bits -j $NIX_BUILD_CORES
+ ln -s ../build-10bits/libx265.a ./libx265-10.a
+ ln -s ../build-12bits/libx265.a ./libx265-12.a
+ '';
+
+ cmakeFlags = cmakeCommonFlags ++ [
+ "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116
"-DENABLE_SHARED=ON"
"-DHIGH_BIT_DEPTH=OFF"
- "-DENABLE_HDR10_PLUS=OFF"
- ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [
- "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
- "-DLINKED_10BIT=ON"
- "-DLINKED_12BIT=ON"
+ "-DENABLE_HDR10_PLUS=ON"
] ++ [
(mkFlag cliSupport "ENABLE_CLI")
- ] ++ cmakeFlagsAll;
+ (mkFlag unittestsSupport "ENABLE_TESTS")
+ ] ++ lib.optionals (multibitdepthSupport) [
+ "-DEXTRA_LIB=x265-10.a;x265-12.a"
+ "-DEXTRA_LINK_FLAGS=-L."
+ "-DLINKED_10BIT=ON"
+ "-DLINKED_12BIT=ON"
+ ];
- preConfigure = ''
- cd source
+ doCheck = unittestsSupport;
+ checkPhase = ''
+ runHook preCheck
+ ./test/TestBench
+ runHook postCheck
'';
postInstall = ''
- rm $out/lib/*.a
+ rm -f ${placeholder "out"}/lib/*.a
'';
- nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl;
-
meta = with lib; {
description = "Library for encoding H.265/HEVC video streams";
homepage = "https://www.x265.org/";
- license = licenses.gpl2;
+ changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index e2d049cd7b3c..4d23752b2420 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -38,5 +38,5 @@ let
};
};
in {
- xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c=";
+ xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM=";
}
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 8d7cb3a48c88..48603000c903 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -22,13 +22,13 @@ assert shared || static;
assert splitStaticOutput -> static;
stdenv.mkDerivation (rec {
- name = "zlib-${version}";
+ pname = "zlib";
version = "1.2.11";
src = fetchurl {
urls =
- [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path
- "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
+ [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz" # stable archive path
+ "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz"
];
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
};
diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
index 959a7203dfa9..c9edfd62e06d 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }:
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-apron-${version}";
+ pname = "ocaml${ocaml.version}-apron";
version = "0.9.13";
src = fetchFromGitHub {
owner = "antoinemine";
diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix
index ba8cd98327fa..8ecac1c124d6 100644
--- a/pkgs/development/ocaml-modules/astring/default.nix
+++ b/pkgs/development/ocaml-modules/astring/default.nix
@@ -14,7 +14,7 @@ let
in
stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-astring-${param.version}";
+ pname = "ocaml${ocaml.version}-astring";
inherit (param) version;
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index c1cb7de2d188..6723ad0c1c81 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -15,7 +15,7 @@ then throw "BAP is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-bap-${version}";
+ pname = "ocaml${ocaml.version}-bap";
version = "2.2.0";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
setupHook = writeText "setupHook.sh" ''
- export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
- export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/"
+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/"
+ export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/"
'';
nativeBuildInputs = [ which makeWrapper ];
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index d2edb69e1b94..69e8289df2cd 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -6,10 +6,9 @@ if !lib.versionAtLeast ocaml.version "4.02"
then throw "batteries is not available for OCaml ${ocaml.version}"
else
-let version = "3.4.0"; in
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-batteries-${version}";
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-batteries";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "ocaml-batteries-team";
diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix
index 07432dd7c6e7..3397821319e3 100644
--- a/pkgs/development/ocaml-modules/benchmark/default.nix
+++ b/pkgs/development/ocaml-modules/benchmark/default.nix
@@ -1,9 +1,8 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }:
-let version = "1.4"; in
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-benchmark-${version}";
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-benchmark";
+ version = "1.4";
src = fetchzip {
url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
index 62438526d703..17a0185829e9 100644
--- a/pkgs/development/ocaml-modules/bos/default.nix
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -3,8 +3,9 @@
}:
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-bos-${version}";
+ pname = "ocaml${ocaml.version}-bos";
version = "0.2.0";
+
src = fetchurl {
url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index 3d79fa377a53..42c27f15a5b1 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -6,7 +6,8 @@ else
stdenv.mkDerivation rec {
version = "2.5";
- name = "ocaml${ocaml.version}-camlpdf-${version}";
+ pname = "ocaml${ocaml.version}-camlpdf";
+
src = fetchFromGitHub {
owner = "johnwhitington";
repo = "camlpdf";
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 2da2b12b5b3b..632430fe4f7f 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -4,10 +4,9 @@ if !lib.versionAtLeast ocaml.version "4.10"
then throw "cpdf is not available for OCaml ${ocaml.version}"
else
-let version = "2.5"; in
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-cpdf-${version}";
+stdenv.mkDerivation rec {
+ pname = "ocaml${ocaml.version}-cpdf";
+ version = "2.5";
src = fetchFromGitHub {
owner = "johnwhitington";
diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix
index d8aa1f371f3b..7bdaf2dfad90 100644
--- a/pkgs/development/ocaml-modules/dum/default.nix
+++ b/pkgs/development/ocaml-modules/dum/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-dum-${version}";
+ pname = "ocaml${ocaml.version}-dum";
version = "1.0.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix
index 4eff6c2957de..2ddef0f40529 100644
--- a/pkgs/development/ocaml-modules/elina/default.nix
+++ b/pkgs/development/ocaml-modules/elina/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.1";
- name = "ocaml${ocaml.version}-elina-${version}";
+ pname = "ocaml${ocaml.version}-elina";
src = fetchurl {
url = "http://files.sri.inf.ethz.ch/elina-${version}.tar.gz";
sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc";
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
index 9eaad7575ec3..3447d590ea23 100644
--- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
version = "0.3+20200317";
- name = "ocaml${ocaml.version}-erm_xmpp-${version}";
+ pname = "ocaml${ocaml.version}-erm_xmpp";
src = fetchFromGitHub {
owner = "hannesm";
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index 1812473e78bf..e951acaa71a5 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-expat-${version}";
+ pname = "ocaml${ocaml.version}-expat";
version = "1.1.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix
index 77eef7f29a98..79b742da575d 100644
--- a/pkgs/development/ocaml-modules/farfadet/default.nix
+++ b/pkgs/development/ocaml-modules/farfadet/default.nix
@@ -7,7 +7,7 @@ then throw "farfadet is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-farfadet-${version}";
+ pname = "ocaml${ocaml.version}-farfadet";
version = "0.3";
src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix
index e68f6a28cb47..bc74a5b58a08 100644
--- a/pkgs/development/ocaml-modules/frontc/default.nix
+++ b/pkgs/development/ocaml-modules/frontc/default.nix
@@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-FrontC-${version}";
+ pname = "ocaml${ocaml.version}-FrontC";
version = "3.4.1";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "FrontC";
- rev = "V_3_4_1";
+ rev = "V_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak";
};
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 9beacd65a646..6de9685715d7 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -1,46 +1,60 @@
{ lib, stdenv, perl, buildPerl, toPerlModule }:
-{ buildInputs ? [], nativeBuildInputs ? [], ... } @ attrs:
+{ buildInputs ? []
+, nativeBuildInputs ? []
+, outputs ? [ "out" "devdoc" ]
+, src ? null
+
+, doCheck ? true
+, checkTarget ? "test"
+
+# Prevent CPAN downloads.
+, PERL_AUTOINSTALL ? "--skipdeps"
+
+# From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows
+# authors to skip certain tests (or include certain tests) when
+# the results are not being monitored by a human being."
+, AUTOMATED_TESTING ? true
+
+# current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
+# https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
+, PERL_USE_UNSAFE_INC ? "1"
+
+, ...
+}@attrs:
assert attrs?pname -> attrs?version;
assert attrs?pname -> !(attrs?name);
lib.warnIf (attrs ? name) "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead"
-toPerlModule(stdenv.mkDerivation (
- (
- lib.recursiveUpdate
- {
- outputs = [ "out" "devdoc" ];
+(let
+ defaultMeta = {
+ homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name`
+ platforms = perl.meta.platforms;
+ };
- doCheck = true;
+ cleanedAttrs = builtins.removeAttrs attrs [
+ "meta" "builder" "version" "pname" "fullperl"
+ "buildInputs" "nativeBuildInputs" "buildInputs"
+ "PERL_AUTOINSTALL" "AUTOMATED_TESTING" "PERL_USE_UNSAFE_INC"
+ ];
- checkTarget = "test";
-
- # Prevent CPAN downloads.
- PERL_AUTOINSTALL = "--skipdeps";
-
- # From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows
- # authors to skip certain tests (or include certain tests) when
- # the results are not being monitored by a human being."
- AUTOMATED_TESTING = true;
-
- # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
- # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
- PERL_USE_UNSAFE_INC = "1";
-
- meta.homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name`
- meta.platforms = perl.meta.platforms;
- }
- attrs
- )
- //
- {
+ package = stdenv.mkDerivation ({
pname = "perl${perl.version}-${lib.getName attrs}"; # TODO: phase-out `attrs.name`
version = lib.getVersion attrs; # TODO: phase-out `attrs.name`
+
builder = ./builder.sh;
+
buildInputs = buildInputs ++ [ perl ];
nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ];
+
fullperl = buildPerl;
- }
-))
+
+ inherit outputs src doCheck checkTarget;
+ inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;
+
+ meta = defaultMeta // (attrs.meta or { });
+ } // cleanedAttrs);
+
+in toPerlModule package)
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
index bb17af144cbe..af125e1f40ef 100644
--- a/pkgs/development/python-modules/Pygments/default.nix
+++ b/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Pygments";
- version = "2.10.0";
+ version = "2.11.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6";
+ sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a";
};
propagatedBuildInputs = [ docutils ];
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 30a0e68dea0c..bda6c950d598 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "absl-py";
- version = "0.15.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81";
+ sha256 = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix
index ca05910511ed..1c31dac5f596 100644
--- a/pkgs/development/python-modules/aioaseko/default.nix
+++ b/pkgs/development/python-modules/aioaseko/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioaseko";
- version = "0.0.1";
+ version = "0.0.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = "v${version}";
- hash = "sha256-dfU2J4aDKNR+GoEmdq/NhX4Mrmm9tmCkse1tb+V5EFQ=";
+ hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 9fbbbac43ef8..f513ab557329 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -10,18 +10,18 @@
buildPythonPackage rec {
pname = "aiobotocore";
- version = "1.4.2";
+ version = "2.1.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "c2f4ef325aaa839e9e2a53346b4c1c203656783a4985ab36fd4c2a9ef2dc1d2b";
+ sha256 = "5fd4d7aefa0896fe4dd32815ead8a52ed5ccb8016c7c5743fe8ff71c3c074120";
};
# relax version constraints: aiobotocore works with newer botocore versions
# the pinning used to match some `extras_require` we're not using.
postPatch = ''
- substituteInPlace setup.py --replace 'botocore>=1.20.106,<1.20.107' 'botocore'
+ sed -i "s/'botocore>=.*'/'botocore'/" setup.py
'';
propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ];
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index a10a84a0425e..06389d50677b 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "10.8.1";
+ version = "10.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
- sha256 = "1hi312gvkrmcxhrc8s3zxwbh87hakd42k5hk7c3xqilc4in3d5dv";
+ sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix
index 1867567178e4..be33becb26c2 100644
--- a/pkgs/development/python-modules/aiohttp-remotes/default.nix
+++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix
@@ -10,15 +10,15 @@
buildPythonPackage rec {
pname = "aiohttp-remotes";
- version = "1.1.0";
- format = "setuptools";
+ version = "1.2.0";
+ format = "flit";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "aiohttp_remotes";
inherit version;
- sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174";
+ sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c";
};
propagatedBuildInputs = [
@@ -42,7 +42,7 @@ buildPythonPackage rec {
];
meta = with lib; {
- description = "A set of useful tools for aiohttp.web server";
+ description = "Set of useful tools for aiohttp.web server";
homepage = "https://github.com/wikibusiness/aiohttp-remotes";
license = licenses.mit;
maintainers = with maintainers; [ qyliss ];
diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix
index 4349bf4fccd3..cae0b10ea690 100644
--- a/pkgs/development/python-modules/aioitertools/default.nix
+++ b/pkgs/development/python-modules/aioitertools/default.nix
@@ -1,20 +1,26 @@
{ lib
-
, buildPythonPackage
, fetchpatch
, fetchPypi
, pythonAtLeast
, pythonOlder
+
+# native
+, flit-core
+
+# propagates
, typing-extensions
-, coverage
+
+# tests
, python
-, toml
}:
buildPythonPackage rec {
pname = "aioitertools";
version = "0.8.0";
- disabled = pythonOlder "3.7";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@@ -30,11 +36,20 @@ buildPythonPackage rec {
})
];
- propagatedBuildInputs = [ typing-extensions ];
- checkInputs = [ coverage toml ];
+ nativeBuildInputs = [
+ flit-core
+ ];
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+ typing-extensions
+ ];
+
+ pythonImportsCheck = [
+ "aioitertools"
+ ];
checkPhase = ''
- ${python.interpreter} -m coverage run -m aioitertools.tests
+ ${python.interpreter} -m unittest discover
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix
index 807b112772cf..5ea482278944 100644
--- a/pkgs/development/python-modules/aioredis/default.nix
+++ b/pkgs/development/python-modules/aioredis/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "aioredis";
- version = "2.0.0";
+ version = "2.0.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db";
+ sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix
index acf106ab3c6d..1fd619a846aa 100644
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiosignal";
- version = "1.2.0";
+ version = "1.2.0"; # re-enable tests after 1.2.0
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -23,6 +23,8 @@ buildPythonPackage rec {
frozenlist
];
+ # not compatible w ith latest asyncio
+ doCheck = false;
checkInputs = [
pytest-asyncio
pytestCheckHook
diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix
index c19e39bcd48f..254f1bfa4fe3 100644
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/pkgs/development/python-modules/aiosmtpd/default.nix
@@ -35,6 +35,9 @@ buildPythonPackage rec {
pytestCheckHook
];
+ # Fixes for Python 3.10 can't be applied easily, https://github.com/aio-libs/aiosmtpd/pull/294
+ doCheck = pythonOlder "3.10";
+
disabledTests = [
# Requires git
"test_ge_master"
diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix
new file mode 100644
index 000000000000..aa7edc001de3
--- /dev/null
+++ b/pkgs/development/python-modules/aiosteamist/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pythonOlder
+, xmltodict
+}:
+
+buildPythonPackage rec {
+ pname = "aiosteamist";
+ version = "0.3.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "bdraco";
+ repo = pname;
+ rev = version;
+ hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ xmltodict
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace "--cov=aiosteamist" ""
+ '';
+
+ pythonImportsCheck = [
+ "aiosteamist"
+ ];
+
+ # Modules doesn't have test suite
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Module to control Steamist steam systems";
+ homepage = "https://github.com/bdraco/aiosteamist";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix
index 7bd56482ed7b..1294f8dade69 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@@ -33,6 +33,10 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pytestFlagsArray = [
+ "--asyncio-mode=auto"
+ ];
+
pythonImportsCheck = [ "aiounifi" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 6e686d9fc907..e4bec8fafa4b 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -6,7 +6,7 @@
, jsonschema
, numpy
, pandas
-, pytest
+, pytestCheckHook
, pythonOlder
, recommonmark
, six
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "altair";
- version = "4.1.0";
+ version = "4.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y";
+ sha256 = "d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026";
};
propagatedBuildInputs = [
@@ -39,7 +39,7 @@ buildPythonPackage rec {
checkInputs = [
glibcLocales
ipython
- pytest
+ pytestCheckHook
recommonmark
sphinx
vega_datasets
@@ -47,11 +47,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "altair" ];
- checkPhase = ''
- export LANG=en_US.UTF-8
- # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags
- rm altair/examples/histogram_responsive.py
- pytest --doctest-modules altair
+ # avoid examples directory, which fetches web resources
+ preCheck = ''
+ cd altair/tests
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix
index 0663fddd6fb0..96115aaee439 100644
--- a/pkgs/development/python-modules/anonip/default.nix
+++ b/pkgs/development/python-modules/anonip/default.nix
@@ -1,24 +1,45 @@
-{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "anonip";
- version = "1.0.0";
+ version = "1.1.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "DigitaleGesellschaft";
repo = "Anonip";
rev = "v${version}";
- sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs";
+ sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc";
};
- propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = "python tests.py";
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace " --cov=anonip --cov-report=term-missing --no-cov-on-fail" ""
+ '';
+
+ pytestFlagsArray = [
+ "tests.py"
+ ];
+
+ pythonImportsCheck = [
+ "anonip"
+ ];
meta = with lib; {
+ description = "Tool to anonymize IP addresses in log files";
homepage = "https://github.com/DigitaleGesellschaft/Anonip";
- description = "A tool to anonymize IP-addresses in log-files";
license = licenses.bsd3;
- maintainers = [ maintainers.mmahut ];
+ maintainers = with maintainers; [ mmahut ];
};
}
diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix
deleted file mode 100644
index 1d0d02988f83..000000000000
--- a/pkgs/development/python-modules/anyjson/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }:
-
-buildPythonPackage rec {
- pname = "anyjson";
- version = "0.3.3";
-
- # The tests are written in a python2 syntax but anyjson is python3 valid
- doCheck = !isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba";
- };
-
- buildInputs = [ nose ];
-
- meta = with lib; {
- homepage = "https://bitbucket.org/runeh/anyjson/";
- description = "Wrapper that selects the best available JSON implementation";
- license = licenses.bsd2;
- };
-}
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index 2fe6fe08ef18..4ac03a8820fb 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -65,13 +65,13 @@
, mkYarnPackage
}:
let
- version = "2.1.4";
+ version = "2.2.3";
airflow-src = fetchFromGitHub rec {
owner = "apache";
repo = "airflow";
rev = version;
- sha256 = "12nxjaz4afkq30s42x3rbsci8jiw2k5zjngsc8i190fasbacbnbs";
+ sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq";
};
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index 5e7ae3860a93..241ddfaa11ab 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "apipkg";
- version = "1.5";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
+ sha256 = "a4be31cf8081e660d2cdea6edfb8a0f39f385866abdcfcfa45e5a0887345cb70";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index 35e6c90f216d..7d2377938cf8 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -1,21 +1,34 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pyperclip }:
+{ lib, buildPythonPackage, fetchFromGitHub
+, beautifulsoup4
+, empty-files
+, numpy
+, pyperclip
+, pytest
+}:
buildPythonPackage rec {
- version = "0.2.6";
+ version = "3.5.0";
pname = "approvaltests";
# no tests included in PyPI tarball
src = fetchFromGitHub {
owner = "approvals";
repo = "ApprovalTests.Python";
- rev = version;
- sha256 = "1k1bj8q1qm89a8xm4az6qk4qswwmgxw5jpdjcxmf93zh5hrcy9h9";
+ rev = "v${version}";
+ sha256 = "15blwjzd6nwh0kzxa9xxscxdn0vqwb1bax8d46wk01dcywdyd6ni";
};
- propagatedBuildInputs = [ pyperclip ];
+ propagatedBuildInputs = [
+ beautifulsoup4
+ empty-files
+ numpy
+ pyperclip
+ pytest
+ ];
postPatch = ''
substituteInPlace setup.py \
+ --replace bs4 beautifulsoup4 \
--replace "pyperclip==1.5.27" "pyperclip>=1.5.27"
'';
diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index 034e3e0df256..46ae3fc34e56 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "apsw";
- version = "3.36.0-r1";
+ version = "3.37.0-r1";
format = "setuptools";
disabled = isPyPy;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "rogerbinns";
repo = "apsw";
rev = version;
- sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg=";
+ sha256 = "0p6rlbk7p6hj5mbmk1a8phazw3ym6hf5103zkxzg4p1jgjgi0xpl";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index cf2f92557206..0aa3e8c1b948 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -7,11 +7,11 @@
}:
buildPythonPackage rec {
pname = "argcomplete";
- version = "1.12.3";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445";
+ sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20";
};
doCheck = false; # meant to be ran with interactive interpreter
diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
new file mode 100644
index 000000000000..3f1f3f86666c
--- /dev/null
+++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cffi
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "argon2-cffi-bindings";
+ version = "21.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3";
+ };
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ cffi
+ ];
+
+ # tarball doesn't include tests, but the upstream tests are minimal
+ doCheck = false;
+ pythonImportsCheck = [ "_argon2_cffi_bindings" ];
+
+ meta = with lib; {
+ description = "Low-level CFFI bindings for Argon2";
+ homepage = "https://github.com/hynek/argon2-cffi-bindings";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix
index a40fb806845e..839429bc948b 100644
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -9,21 +9,26 @@
, isPy3k
, lib
, stdenv
+, argon2-cffi-bindings
}:
buildPythonPackage rec {
pname = "argon2_cffi";
- version = "21.1.0";
+ version = "21.3.0";
+ format = "flit";
src = fetchPypi {
pname = "argon2-cffi";
inherit version;
- sha256 = "sha256-9xC2EQPRofaSyj7L0Tc+KKpeVFrGJboGf/L+yhsruHA=";
+ sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b";
};
propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34;
- propagatedNativeBuildInputs = [ cffi ];
+ propagatedNativeBuildInputs = [
+ argon2-cffi-bindings
+ cffi
+ ];
ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0";
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 363d8900163a..1a9ba2dd0963 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "asdf";
- version = "2.8.1";
+ version = "2.8.3";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw=";
+ sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 101f84b4fcea..ab62a565ce67 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "astroid";
- version = "2.9.0"; # Check whether the version is compatible with pylint
+ version = "2.9.3"; # Check whether the version is compatible with pylint
disabled = pythonOlder "3.6.2";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "PyCQA";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY=";
+ sha256 = "1x77faggk1dgxy48ng31xj9h6p51w312kvk5zqgvd5f19nvznxyi";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 889c69d5313b..78f02e2870ce 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -1,49 +1,55 @@
{ lib
, fetchPypi
-, setuptools-scm
, buildPythonPackage
-, isPy3k
+, pythonOlder
+
+# build time
+, astropy-extension-helpers
+, astropy-helpers
, cython
, jinja2
+, setuptools-scm
+
+# runtime
, numpy
-, pytest
-, pytest-astropy
-, astropy-helpers
-, astropy-extension-helpers
+, packaging
, pyerfa
+, pyyaml
}:
-buildPythonPackage rec {
+let
pname = "astropy";
- version = "4.3.1";
+ version = "5.0";
+in
+buildPythonPackage {
+ inherit pname version;
format = "pyproject";
- disabled = !isPy3k; # according to setup.py
+ disabled = pythonOlder "3.8"; # according to setup.cfg
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE=";
+ sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927";
};
- nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ];
- propagatedBuildInputs = [ numpy pyerfa ];
- checkInputs = [ pytest pytest-astropy ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
- preBuild = ''
- export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
- '';
+ nativeBuildInputs = [
+ astropy-extension-helpers
+ astropy-helpers
+ cython
+ jinja2
+ setuptools-scm
+ ];
- # Tests must be run from the build directory. astropy/samp tests
- # require a network connection, so we ignore them. For some reason
- # pytest --ignore does not work, so we delete the tests instead.
- checkPhase = ''
- cd build/lib.*
- rm -f astropy/samp/tests/*
- pytest
- '';
+ propagatedBuildInputs = [
+ numpy
+ packaging
+ pyerfa
+ pyyaml
+ ];
- # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s
- # doCheck = false;
+ # infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself)
doCheck = false;
meta = with lib; {
diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
index f7764149a663..8853b1e9e08d 100644
--- a/pkgs/development/python-modules/astroquery/default.nix
+++ b/pkgs/development/python-modules/astroquery/default.nix
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "astroquery";
- version = "0.4.1";
+ version = "0.4.5";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "0xpqrl9h7sg55mql38xsfpbz9rxsm3mxfha1biqyly1gmxpmd47a";
+ sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix
index dfbd0dbb9968..fb7dec6d6ed4 100644
--- a/pkgs/development/python-modules/async_generator/default.nix
+++ b/pkgs/development/python-modules/async_generator/default.nix
@@ -1,25 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }:
buildPythonPackage rec {
- pname = "async_generator";
+ pname = "async-generator";
version = "1.10";
disabled = pythonOlder "3.5";
src = fetchPypi {
- inherit pname version;
+ pname = "async_generator";
+ inherit version;
sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144";
};
+ # no longer compatible with pytest-asyncio
+ doCheck = false;
checkInputs = [ pytest pytest-asyncio ];
checkPhase = ''
pytest -W error -ra -v --pyargs async_generator
'';
- # disable tests on python3.5 to avoid circular dependency with pytest-asyncio
- doCheck = !isPy35;
-
meta = with lib; {
description = "Async generators and context managers for Python 3.5+";
homepage = "https://github.com/python-trio/async_generator";
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index ae8bacc94415..2a67ed1d6710 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "async-timeout";
- version = "4.0.1";
+ version = "4.0.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uTDLFho5BC+SIvbvtzATmch+6rOUcn7FQ3kko21u71E=";
+ sha256 = "2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix
index fd8a52f5a6ae..c0ae1cea95f7 100644
--- a/pkgs/development/python-modules/asyncio_mqtt/default.nix
+++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "asyncio-mqtt";
- version = "0.11.0";
+ version = "0.12.1";
format = "setuptools";
src = fetchPypi {
pname = "asyncio_mqtt";
inherit version;
- sha256 = "sha256-uJown3bNA+pLJlorJcCjpMMFosX94gt/2tLAjIkuXLA=";
+ sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix
index 8bf81556770a..16f0f0ddffd9 100644
--- a/pkgs/development/python-modules/atpublic/default.nix
+++ b/pkgs/development/python-modules/atpublic/default.nix
@@ -3,22 +3,27 @@
, fetchPypi
, pytestCheckHook
, pythonOlder
+, pdm-pep517
, sybil
, typing-extensions
}:
buildPythonPackage rec {
pname = "atpublic";
- version = "2.3";
- format = "setuptools";
+ version = "3.0.1";
+ format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d6b9167fc3e09a2de2d2adcfc9a1b48d84eab70753c97de3800362e1703e3367";
+ sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf";
};
+ nativeBuildInputs = [
+ pdm-pep517
+ ];
+
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
typing-extensions
];
@@ -29,8 +34,7 @@ buildPythonPackage rec {
];
postPatch = ''
- substituteInPlace setup.cfg \
- --replace "--cov=public" ""
+ sed -i '/cov=public/d' pyproject.toml
'';
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 4ca5df17109f..ca01e35a3c55 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -1,7 +1,6 @@
{ lib
, boto3
, buildPythonPackage
-, enum34
, fetchFromGitHub
, jsonschema
, mock
@@ -15,6 +14,9 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
version = "1.42.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aws";
@@ -27,11 +29,11 @@ buildPythonPackage rec {
boto3
jsonschema
six
- ] ++ lib.optionals (pythonOlder "3.4") [
- enum34
];
postPatch = ''
+ substituteInPlace requirements/base.txt \
+ --replace "jsonschema~=3.2" "jsonschema>=3.2"
substituteInPlace pytest.ini \
--replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" ""
'';
@@ -43,7 +45,14 @@ buildPythonPackage rec {
pyyaml
];
- pythonImportsCheck = [ "samtranslator" ];
+ disabledTests = [
+ # AssertionError: Expected 7 errors, found 9:
+ "test_errors_13_error_definitionuri"
+ ];
+
+ pythonImportsCheck = [
+ "samtranslator"
+ ];
meta = with lib; {
description = "Python library to transform SAM templates into AWS CloudFormation templates";
diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index 4ca232a2a815..edbc289114bb 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "awscrt";
- version = "0.13.1";
+ version = "0.13.2";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1Qx3fcZ0I9RONLpFPDyXHkUEAF09KBgXV64NvepmDm8=";
+ sha256 = "sha256-2lkx6fDbPAasiT6G/uSudNt+kRU+xJNNo8oTaLde2rQ=";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index c3d29d932442..30ca58fed319 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "basemap";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "matplotlib";
repo = "basemap";
- rev = "v${version}rel";
- sha256 = "13lw1iwa8hadpvqdgb06nh881l8c17awzvvwbfwblvb9q9s0lnzp";
+ rev = "v${version}";
+ sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3";
};
propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ];
diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix
index 3d3c85eea3b4..a4430b655ce1 100644
--- a/pkgs/development/python-modules/bip_utils/default.nix
+++ b/pkgs/development/python-modules/bip_utils/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bip_utils";
- version = "1.11.1";
+ version = "2.1.0";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "ebellocchia";
repo = pname;
rev = "v${version}";
- sha256 = "0r8h979rklq7cvl0b449mfrx62dv367s31zgwfqn81kj72i3ndg4";
+ sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m";
};
propagatedBuildInputs = [ ecdsa pysha3 ];
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
index 9372248fede1..743c749a1f1b 100644
--- a/pkgs/development/python-modules/bitarray/default.nix
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "bitarray";
- version = "2.3.5";
+ version = "2.3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "60285184cb02fdba5e1cc8605ac84e150a50f940e9383ab43564e5258d1f47bb";
+ sha256 = "sha256-O/21ne0VyWHm49W38WcVXNoFO+JHXqgBdGHfC02CC30=";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 431edac75dfa..7db587ed58be 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "bleak";
- version = "0.14.0";
+ version = "0.14.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b449cc63f769c2d219c67e23ffb9f3a5b5f23eb2d68d05878743dbed83a14360";
+ sha256 = "1fkq8q54s9apqiamdd8vgrhk5p02w5w281q93dfnrd37xv7ysk6h";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index af358a61f181..c6fdc8c9981c 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.20.21"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "2fb05cbe81b9ce11d9394fc6c4ffa5fd1cceb114dc1d2887dc61081707e44522";
+ sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 43fad7124553..6d5c11665c2c 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.23.21"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "d7f8e82cba38aa1e66015cab0a5ca3204503e90afc4695e97228e28329a14c04";
+ sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index 0556c5b4e2a2..d4cff163a0b1 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -12,9 +12,9 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "v${version}";
- sha256 = "1rdp9rx197q467ixp53g4cgc3jbsdaxr62pz0a8ayv2lvm944azh";
+ sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o=";
# for some reason, the test data isn't captured in releases, force a git checkout
- deepClone = true;
+ forceFetchGit = true;
};
dontConfigure = true;
diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix
index 0838558e116a..ed6f03fa5b0b 100644
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/pkgs/development/python-modules/cachelib/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "cachelib";
- version = "0.3.0";
+ version = "0.5.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pallets";
repo = pname;
rev = version;
- sha256 = "sha256-ssyHNlrSrG8YHRS131jJtmgl6eMTNdet1Hf0nTxL8sM=";
+ sha256 = "0sry5kn52hc742400xff99zpij0dxlvbd5m8il7k9ihpywrfvzd5";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index 1bff572b6032..f38eb328e3d9 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -7,16 +7,16 @@
buildPythonPackage rec {
pname = "cachetools";
- version = "4.2.4";
+ version = "5.0.0";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tkem";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-doPLl7Ooc2cKlTiS/dqLTKSkTlSgPFztIumAzciM0bc=";
+ hash = "sha256-urTkls1S83m7Eo7chPaQc5gxz0omZBToNYa8upQEiOo=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix
deleted file mode 100644
index a772535ad82b..000000000000
--- a/pkgs/development/python-modules/carrot/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, nose, amqplib, anyjson }:
-
-buildPythonPackage rec {
- pname = "carrot";
- version = "0.10.7";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb";
- };
-
- buildInputs = [ nose ];
- propagatedBuildInputs = [ amqplib anyjson ];
-
- doCheck = false; # depends on the network
-
- meta = with lib; {
- homepage = "https://pypi.python.org/pypi/carrot";
- description = "AMQP Messaging Framework for Python";
- };
-}
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index e2eac2dd0726..d233cf031647 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "cartopy";
- version = "0.20.1";
+ version = "0.20.2";
src = fetchPypi {
inherit version;
pname = "Cartopy";
- sha256 = "91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3";
+ sha256 = "4d08c198ecaa50a6a6b109d0f14c070e813defc046a83ac5d7ab494f85599e35";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 815bc8ae36cb..12ea06a5c4f7 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "1.15.2";
+ version = "1.15.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50";
+ sha256 = "0vczml14dvvrj401r08d6b0rfn5p5kfm1wr0vrfi8rqk2z5x1w0g";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix
index b93ea9c3bd78..e1c27d9e4fb1 100644
--- a/pkgs/development/python-modules/cchardet/default.nix
+++ b/pkgs/development/python-modules/cchardet/default.nix
@@ -14,9 +14,27 @@ buildPythonPackage rec {
sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf";
};
+ pythonImportsCheck = [
+ "cchardet"
+ ];
+
checkInputs = [ nose ];
+
+ preCheck = ''
+ cp -R src/tests $TMPDIR
+ pushd $TMPDIR
+ '';
+
checkPhase = ''
- ${python.interpreter} setup.py nosetests
+ runHook preCheck
+
+ nosetests
+
+ runHook postCheck
+ '';
+
+ postCheck = ''
+ popd
'';
meta = {
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 8bf70f95c0f8..4a00155a4ec6 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
- version = "2.1.1";
+ version = "2.1.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
- sha256 = "sha256-S3sxYCGMg/O5ICr9z4NqjmpPCF7e5F8G2q2EX4bRN+8=";
+ sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 94a4ea5e10f2..354f90f12b6b 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -3,16 +3,12 @@
, fetchFromGitHub
, pythonOlder
, aws-sam-translator
-, importlib-metadata
-, importlib-resources
, jschema-to-python
, jsonpatch
, jsonschema
, junit-xml
, networkx
-, pathlib2
, pyyaml
-, requests
, sarif-om
, setuptools
, six
@@ -23,18 +19,18 @@
buildPythonPackage rec {
pname = "cfn-lint";
- version = "0.56.3";
+ version = "0.56.4";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = "cfn-python-lint";
rev = "v${version}";
- sha256 = "12r0zxwidf4vdbbpzlhlmgc2as5bn45yf663f00iv6px0glq02zs";
+ sha256 = "0li8zkdvmgfxqzqs1rvd48mwim0bhjwmxlywqxjix0a43kvkvh77";
};
postPatch = ''
substituteInPlace setup.py \
- --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"'
+ --replace "jsonschema~=3.0" "jsonschema>=3.0"
'';
propagatedBuildInputs = [
@@ -44,13 +40,10 @@ buildPythonPackage rec {
jsonschema
junit-xml
networkx
- pathlib2
pyyaml
- requests
sarif-om
- setuptools
six
- ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ];
+ ];
checkInputs = [
mock
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index 07259d5e59cf..762846ab34c2 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -24,13 +24,13 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.26.2";
+ version = "1.26.4";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = version;
- sha256 = "sha256-zF7wmrJTMX0Cr3wpJECUqhH58G2SLiVoC4Z2XbblQdQ=";
+ sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 6e9256ffacfe..436669d92092 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -1,16 +1,16 @@
{ lib
, stdenv
-, fetchPypi
, buildPythonPackage
-, isPy3k
+, fetchPypi
, jaraco_functools
, jaraco_text
, more-itertools
, portend
, pyopenssl
-, pytestCheckHook
-, pytest-cov
+, pypytools
, pytest-mock
+, pytestCheckHook
+, pythonOlder
, requests
, requests-toolbelt
, requests-unixsocket
@@ -22,21 +22,22 @@
buildPythonPackage rec {
pname = "cheroot";
- version = "8.5.2";
+ version = "8.6.0";
- disabled = !isPy3k;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567";
+ hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU=";
};
- nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ];
+ nativeBuildInputs = [
+ setuptools-scm
+ setuptools-scm-git-archive
+ ];
propagatedBuildInputs = [
- # install_requires
jaraco_functools
-
more-itertools
six
];
@@ -45,9 +46,9 @@ buildPythonPackage rec {
jaraco_text
portend
pyopenssl
- pytestCheckHook
- pytest-cov
+ pypytools
pytest-mock
+ pytestCheckHook
requests
requests-toolbelt
requests-unixsocket
@@ -79,6 +80,10 @@ buildPythonPackage rec {
"cheroot/test/test_wsgi.py"
];
+ pythonImportsCheck = [
+ "cheroot"
+ ];
+
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
@@ -86,5 +91,6 @@ buildPythonPackage rec {
description = "High-performance, pure-Python HTTP";
homepage = "https://github.com/cherrypy/cheroot";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
index 19fdac37615a..dcfcab597b90 100644
--- a/pkgs/development/python-modules/click-completion/default.nix
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -1,18 +1,38 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k,
- click, jinja2, shellingham, six
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+
+# propagates
+, click
+, jinja2
+, shellingham
+, six
}:
buildPythonPackage rec {
pname = "click-completion";
version = "0.5.2";
- disabled = (!isPy3k);
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86";
};
- propagatedBuildInputs = [ click jinja2 shellingham six ];
+ propagatedBuildInputs = [
+ click
+ jinja2
+ shellingham
+ six
+ ];
+
+ pythonImportsCheck = [
+ "click_completion"
+ ];
+
+ # has no tests
+ doCheck = false;
meta = with lib; {
description = "Add or enhance bash, fish, zsh and powershell completion in Click";
diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix
index ce229665c659..0eebbb449e1d 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/pkgs/development/python-modules/cliff/default.nix
@@ -3,11 +3,14 @@
, fetchPypi
, autopage
, cmd2
+, installShellFiles
+, openstackdocstheme
, pbr
, prettytable
, pyparsing
, pyyaml
, stevedore
+, sphinx
, callPackage
}:
@@ -26,6 +29,12 @@ buildPythonPackage rec {
rm test-requirements.txt
'';
+ nativeBuildInputs = [
+ installShellFiles
+ openstackdocstheme
+ sphinx
+ ];
+
propagatedBuildInputs = [
autopage
cmd2
@@ -36,6 +45,11 @@ buildPythonPackage rec {
stevedore
];
+ postInstall = ''
+ sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man
+ installManPage doc/build/man/cliff.1
+ '';
+
# check in passthru.tests.pytest to escape infinite recursion with stestr
doCheck = false;
diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix
index 66e2d5f52f38..45733c4ae7f1 100644
--- a/pkgs/development/python-modules/clint/default.nix
+++ b/pkgs/development/python-modules/clint/default.nix
@@ -22,12 +22,18 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8";
+ propagatedBuildInputs = [ pillow blessings args ];
+
+ # nose-progressive and clint are not actively maintained
+ # no longer compatible as behavior demand 2to3, which was removed
+ # in setuptools>=58
+ doCheck = false;
+ checkInputs = [ mock nose nose_progressive pkgs.glibcLocales ];
checkPhase = ''
${python.interpreter} test_clint.py
'';
- buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ];
- propagatedBuildInputs = [ pillow blessings args ];
+ pythonImportsCheck = [ "clint" ];
meta = with lib; {
homepage = "https://github.com/kennethreitz/clint";
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index f525b6e7f1df..0e0debe93291 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "cloudpickle";
- version = "1.6.0";
+ version = "2.0.0";
disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
- sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32";
+ sha256 = "5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4";
};
buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index 13720f9d88bc..20d822d8ee77 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "cloudsplaining";
- version = "0.4.10";
+ version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "salesforce";
repo = pname;
rev = version;
- hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk=";
+ hash = "sha256-HdZHRK/Q544z9ySbjNIjqiXzel0UTsnb9tuXawbkwZg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix
index 2aefb51d481e..c1d3b8916d91 100644
--- a/pkgs/development/python-modules/commentjson/default.nix
+++ b/pkgs/development/python-modules/commentjson/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }:
+{ lib, buildPythonPackage, fetchFromGitHub, six, lark, pytestCheckHook }:
buildPythonPackage rec {
pname = "commentjson";
@@ -13,13 +13,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "lark-parser>=0.7.1,<0.8.0" "lark-parser"
+ --replace "lark-parser>=0.7.1,<0.8.0" "lark"
# NixOS is missing test.test_json module
rm -r commentjson/tests/test_json
'';
- propagatedBuildInputs = [ lark-parser six ];
+ propagatedBuildInputs = [ lark six ];
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix
index 1bb036b97df5..7c1594e9e805 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/pkgs/development/python-modules/configargparse/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "configargparse";
- version = "1.5.2";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = "bw2";
repo = "ConfigArgParse";
- rev = version;
- sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2";
+ rev = "v${version}";
+ sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix
index 9f67aacf2d4e..2cd66636b016 100644
--- a/pkgs/development/python-modules/configshell/default.nix
+++ b/pkgs/development/python-modules/configshell/default.nix
@@ -1,4 +1,10 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pyparsing
+, six
+, urwid
+}:
buildPythonPackage rec {
pname = "configshell";
@@ -11,11 +17,28 @@ buildPythonPackage rec {
sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9";
};
- propagatedBuildInputs = [ pyparsing six urwid ];
+ propagatedBuildInputs = [
+ pyparsing
+ six
+ urwid
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pyparsing >=2.0.2,<3.0" "pyparsing >=2.0.2"
+ '';
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "configshell"
+ ];
meta = with lib; {
- description = "A Python library for building configuration shells";
+ description = "Python library for building configuration shells";
homepage = "https://github.com/open-iscsi/configshell-fb";
license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index 2b350be00460..e28621f26a99 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -1,24 +1,24 @@
-{ buildPythonPackage
-, enum34
+{ lib
+, buildPythonPackage
, fetchFromGitHub
, flit-core
-, isPy27
-, lib
-, pathlib
, pyyaml
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "confuse";
- version = "1.5.0";
+ version = "1.7.0";
format = "flit";
+ disabled = pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = "beetbox";
repo = pname;
rev = "v${version}";
- sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7";
+ sha256 = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
};
nativeBuildInputs = [
@@ -27,16 +27,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pyyaml
- ] ++ lib.optionals isPy27 [
- enum34
- pathlib
- ] ;
+ ];
checkInputs = [
pytestCheckHook
];
- pythonImportsCheck = [ "confuse" ];
+ pythonImportsCheck = [
+ "confuse"
+ ];
meta = with lib; {
description = "Python configuration library for Python that uses YAML";
diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index bfe4fc221445..465bee6664df 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "connexion";
- version = "2.10.0";
+ version = "2.11.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "zalando";
repo = pname;
rev = version;
- sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8=";
+ sha256 = "sha256-m/r09VNp/AMssOJH9RKMhPcObGHl9uIAoS1PwrjpKaE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index f93d32d392f7..f1930b88fb8c 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -2,15 +2,18 @@
, buildPythonPackage
, fetchPypi
, mock
+, pythonOlder
}:
buildPythonPackage rec {
pname = "coverage";
- version = "5.5";
+ version = "6.2";
+ # uses f strings
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c";
+ sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8";
};
# No tests in archive
diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index d73ee597adc5..ed8f127ff274 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -4,22 +4,21 @@
, python-dateutil
, pytestCheckHook
, pytz
-, natsort
, tzlocal
}:
buildPythonPackage rec {
pname = "croniter";
- version = "1.1.0";
+ version = "1.2.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "4023e4d18ced979332369964351e8f4f608c1f7c763e146b1d740002c4245247";
+ hash = "sha256-CUQi9q657WRnFDk1A/o4iv5PhG4RDhmX/qV5TiCFwtc=";
};
propagatedBuildInputs = [
python-dateutil
- natsort
];
checkInputs = [
@@ -28,12 +27,14 @@ buildPythonPackage rec {
tzlocal
];
- pythonImportsCheck = [ "croniter" ];
+ pythonImportsCheck = [
+ "croniter"
+ ];
meta = with lib; {
- description = "croniter provides iteration for datetime object with cron like format";
+ description = "Library to iterate over datetime object with cron like format";
homepage = "https://github.com/kiorky/croniter";
license = licenses.mit;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix
index b8ed7721f064..12aa1590742a 100644
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "crownstone-uart";
- version = "2.2.0";
+ version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "crownstone";
repo = "crownstone-lib-python-uart";
rev = version;
- sha256 = "sha256-5K7NzJ7fKOW4Uh1XIlicVkRZuM84qTM5RQc/DfP9OEc=";
+ sha256 = "sha256-temf+uvGWMMtnhBpbYtTj6OzKqo3Xaa11Q2VX2+HTZc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index ede96fc3b41d..c3778415e570 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "cwcwidth";
- version = "0.1.4";
+ version = "0.1.6";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8";
+ sha256 = "1b31da599c9f0cf41f39ed10c1ceaa01d6024e31c6cd9aea2885b1f2a6d15fba";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 39d01559d460..0358083c3a57 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "dask";
- version = "2021.10.0";
+ version = "2022.01.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -32,19 +32,10 @@ buildPythonPackage rec {
owner = "dask";
repo = pname;
rev = version;
- sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p";
+ sha256 = "sha256-HlVvnhEDzefzv9xchlXl9d4KCumoAqoYUWmIiCXLJyM=
+";
};
- patches = [
- # remove with next bump
- (fetchpatch {
- name = "fix-tests-against-distributed-2021.10.0.patch";
- url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch";
- includes = [ "dask/tests/test_distributed.py" ];
- sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al";
- })
- ];
-
propagatedBuildInputs = [
cloudpickle
fsspec
@@ -82,7 +73,7 @@ buildPythonPackage rec {
pytestFlagsArray = [
# parallelize
- "--numprocesses auto"
+ "--numprocesses $NIX_BUILD_CORES"
# rerun failed tests up to three times
"--reruns 3"
# don't run tests that require network access
diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix
index 2facff6c840b..e85bdd7868c9 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/pkgs/development/python-modules/databases/default.nix
@@ -14,7 +14,8 @@
buildPythonPackage rec {
pname = "databases";
- version = "0.5.3";
+ version = "0.5.4";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE=";
+ hash = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index b4b60da17f9f..ab5e929818c6 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "datasets";
- version = "1.16.1";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = version;
- sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io=";
+ sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 7908b3c6b496..31c6ba175d5d 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -18,7 +18,6 @@
, httpx
# Check Inputs
, pytestCheckHook
-, pytest-runner
, pytest-asyncio
, pytest-timeout
, aiohttp
@@ -31,7 +30,7 @@
buildPythonPackage rec {
pname = "datasette";
- version = "0.59.4";
+ version = "0.60.1";
disabled = pythonOlder "3.6";
@@ -39,11 +38,9 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = version;
- sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM=";
+ sha256 = "sha256-x4bqd8hFPNLkDIsuTTy+WbAjuUl6lXsmIZoiRi7ZOm8=";
};
- nativeBuildInputs = [ pytest-runner ];
-
propagatedBuildInputs = [
aiofiles
asgi-csrf
@@ -74,6 +71,8 @@ buildPythonPackage rec {
];
postConfigure = ''
+ substituteInPlace setup.py \
+ --replace '"pytest-runner"' ""
substituteInPlace setup.py \
--replace "click-default-group~=1.2.2" "click-default-group" \
--replace "hupper~=1.9" "hupper" \
diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix
index bbfa60f03b69..8994e1d28cd2 100644
--- a/pkgs/development/python-modules/dbutils/default.nix
+++ b/pkgs/development/python-modules/dbutils/default.nix
@@ -2,21 +2,29 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
- version = "3.0.1";
pname = "dbutils";
+ version = "3.0.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "DBUtils";
- sha256 = "6ec83f4d75d7a7b42a92e86b775f251e2671639b3b2123fe13a5d8d8fe7c5643";
+ hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM=";
};
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- pythonImportsCheck = [ "dbutils" ];
+ pythonImportsCheck = [
+ "dbutils"
+ ];
meta = with lib; {
description = "Database connections for multi-threaded environments";
diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix
index f260727b87a6..5efad065011d 100644
--- a/pkgs/development/python-modules/deap/default.nix
+++ b/pkgs/development/python-modules/deap/default.nix
@@ -9,11 +9,19 @@ buildPythonPackage rec {
sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i";
};
+ postPatch = ''
+ sed -i '/use_2to3=True/d' setup.py
+ '';
+
propagatedBuildInputs = [ numpy matplotlib ];
+ preBuild = ''
+ 2to3 -wn deap
+ '';
+
checkInputs = [ nose ];
checkPhase = ''
- ${python.interpreter} setup.py nosetests --verbosity=3
+ nosetests --verbosity=3
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/decopatch/default.nix b/pkgs/development/python-modules/decopatch/default.nix
index 7fa3c6465db4..92c2c27de2f6 100644
--- a/pkgs/development/python-modules/decopatch/default.nix
+++ b/pkgs/development/python-modules/decopatch/default.nix
@@ -3,31 +3,42 @@
, fetchPypi
, makefun
, setuptools-scm
+, pythonOlder
}:
buildPythonPackage rec {
pname = "decopatch";
- version = "1.4.8";
+ version = "1.4.9";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6";
+ hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8=";
};
- nativeBuildInputs = [ setuptools-scm ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
- propagatedBuildInputs = [ makefun ];
+ propagatedBuildInputs = [
+ makefun
+ ];
postPatch = ''
- substituteInPlace setup.py --replace "'pytest-runner', " ""
+ substituteInPlace setup.cfg \
+ --replace "pytest-runner" ""
'';
+ pythonImportsCheck = [
+ "decopatch"
+ ];
+
# Tests would introduce multiple cirucular dependencies
# Affected: makefun, pytest-cases
doCheck = false;
- pythonImportsCheck = [ "decopatch" ];
-
meta = with lib; {
description = "Python helper for decorators";
homepage = "https://github.com/smarie/python-decopatch";
diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index 0c1889963157..e26c1a108188 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "decorator";
- version = "5.1.0";
+ version = "5.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7";
+ sha256 = "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index e4bffd93eb24..0f01ebab4a55 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
- version = "5.1.1";
+ version = "5.2.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gzavZ6/8k/JfcOlwWuMV+4AQxbkfWWgbBrHNcnuU51E=";
+ sha256 = "sha256-jaF5vQx8/qP9pGLfilx86v1GxHbjxaRghjjI5Me0pU0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix
deleted file mode 100644
index a25ecd74b5d0..000000000000
--- a/pkgs/development/python-modules/demjson/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib
-, python
-, buildPythonPackage
-, fetchPypi
-, isPy3k
-}:
-
-buildPythonPackage rec {
- pname = "demjson";
- version = "2.2.4";
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";
- };
-
- doCheck = !(isPy3k);
-
- checkPhase = ''
- ${python.interpreter} test/test_demjson.py
- '';
-
- pythonImportsCheck = [
- "demjson"
- ];
-
- meta = with lib; {
- description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
- homepage = "https://github.com/dmeranda/demjson";
- license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ bjornfor ];
- };
-}
diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix
index d6173494e8dc..84d98d091356 100644
--- a/pkgs/development/python-modules/diagrams/default.nix
+++ b/pkgs/development/python-modules/diagrams/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "diagrams";
- version = "0.21.0";
+ version = "0.21.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mingrammer";
repo = pname;
rev = "v${version}";
- sha256 = "1vj14kqffpafykyr9x5dcfhmqqvxq08lrp94lhqpdzikh6a0a0jx";
+ sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index 1751271a2221..5414f7522dbe 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -2,51 +2,61 @@
, buildPythonPackage
, chardet
, fetchPypi
-, inflect
, jinja2
, jinja2_pluralize
+, pluggy
, pycodestyle
, pyflakes
, pygments
, pylint
+, pytest-datadir
, pytest-mock
, pytestCheckHook
, pythonOlder
+, tomli
}:
buildPythonPackage rec {
pname = "diff-cover";
- version = "5.5.0";
+ version = "6.4.4";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "diff_cover";
inherit version;
- sha256 = "e2d36131c13f571d9f5c4109b9e08b71ed00757eabec0156de74e33f6ef5627f";
+ sha256 = "b1d782c1ce53ad4b2c5545f8b7aa799eb61a0b12a62b376a18e2313c6f2d77f1";
};
propagatedBuildInputs = [
chardet
- inflect
jinja2
jinja2_pluralize
+ pluggy
pygments
+ tomli
];
checkInputs = [
pycodestyle
pyflakes
pylint
+ pytest-datadir
pytest-mock
pytestCheckHook
];
disabledTests = [
- "added_file_pylint_console"
+ # Tests check for flake8
"file_does_not_exist"
+ # AssertionError: assert '.c { color:...
+ "test_style_defs"
];
- pythonImportsCheck = [ "diff_cover" ];
+ pythonImportsCheck = [
+ "diff_cover"
+ ];
meta = with lib; {
description = "Automatically find diff lines that need test coverage";
diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix
new file mode 100644
index 000000000000..49de32439d12
--- /dev/null
+++ b/pkgs/development/python-modules/discovery30303/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, poetry-core
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "discovery30303";
+ version = "0.2.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "bdraco";
+ repo = pname;
+ # Commit points to 0.2.1, https://github.com/bdraco/discovery30303/issues/1
+ rev = "0d0b0fdca1a98662dd2e6174d25853703bd6bf07";
+ hash = "sha256-WSVMhiJxASxAkxs6RGuAVvEFS8TPxDKE9M99Rp8HKGM=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace " --cov=discovery30303" ""
+ '';
+
+ pythonImportsCheck = [
+ "discovery30303"
+ ];
+
+ meta = with lib; {
+ description = "Module to discover devices that respond on port 30303";
+ homepage = "https://github.com/bdraco/discovery30303";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix
index 1c565b3f158b..ec4e8ecdc6f5 100644
--- a/pkgs/development/python-modules/distlib/default.nix
+++ b/pkgs/development/python-modules/distlib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "distlib";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05";
+ sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 6dfb531a78b6..08e38f2a1498 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "distributed";
- version = "2021.11.2";
+ version = "2021.12.0";
disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
- sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302";
+ sha256 = "c6119a2cf1fb2d8ac60337915bb9a790af6530afcb5d7a809a3308323b874714";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index 9e58f1eaab8a..2a858d838357 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "django-auth-ldap";
- version = "3.0.0";
+ version = "4.0.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa";
+ sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix
index 0bbdac356cd0..5d43afc77949 100644
--- a/pkgs/development/python-modules/django-timezone-field/default.nix
+++ b/pkgs/development/python-modules/django-timezone-field/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "django-timezone-field";
- version = "4.2.1";
+ version = "4.2.3";
format = "setuptools";
disabled = pythonOlder "3.5";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mfogel";
repo = pname;
rev = version;
- sha256 = "0swld4168pfhppr9q3i9r062l832cmmx792kkvlcvxfbdhk6qz9h";
+ sha256 = "sha256-purzXzPvnYNVsASsK6s9m4XieUL80FOjeSbUP4bpRj8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix
index 853e12327d32..63e575b63454 100644
--- a/pkgs/development/python-modules/django-widget-tweaks/default.nix
+++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "django-widget-tweaks";
- version = "1.4.8";
+ version = "1.4.12";
src = fetchFromGitHub { # package from Pypi missing runtests.py
owner = "jazzband";
repo = pname;
rev = version;
- sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg";
+ sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h";
};
checkPhase = "${python.interpreter} runtests.py";
diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix
index f20eb49c0233..c4df27beaaa2 100644
--- a/pkgs/development/python-modules/django/2.nix
+++ b/pkgs/development/python-modules/django/2.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.2.26";
+ version = "2.2.27";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-36U3Jn1SxiQ6YrMoVadEyoPDfHBgCqz/v9mLxdbYUY8=";
+ sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM=";
};
patches = lib.optional withGdal
diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix
index a7bafcfb2707..3ed7024c3499 100644
--- a/pkgs/development/python-modules/django/3.nix
+++ b/pkgs/development/python-modules/django/3.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "3.2.11";
+ version = "3.2.12";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-aclKvl1rGwiL9HXgm3t0QD+UPjTaEH55hGXSBF2ifnU=";
+ sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI=";
};
patches = lib.optional withGdal
diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix
index facfc2fafcdb..f0550a296aa9 100644
--- a/pkgs/development/python-modules/djangoql/default.nix
+++ b/pkgs/development/python-modules/djangoql/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "djangoql";
- version = "0.16.0";
+ version = "0.17.1";
src = fetchPypi {
inherit pname version;
- sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf";
+ sha256 = "sha256-TwU9ASjij0EpJuLakCc19L3Lq1wI1Dvk3+/XR/yi6W4=";
};
propagatedBuildInputs = [ ply ];
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index e4a319b31a89..40b3d7a36dec 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -2,26 +2,40 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
+, setuptools-scm
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dnspython";
- version = "2.1.0";
+ version = "2.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- extension = "zip";
- sha256 = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4";
+ extension = "tar.gz";
+ sha256 = "1mi6l2n766y1gic3x1swp2jk2nr7wbkb191qinwhddnh6bh534z7";
};
- # needs networking for some tests
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # dns.exception.SyntaxError: protocol not found
+ "test_misc_good_WKS_text"
+ ];
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
pythonImportsCheck = [ "dns" ];
meta = with lib; {
description = "A DNS toolkit for Python";
homepage = "https://www.dnspython.org";
license = with licenses; [ isc ];
+ maintainers = with maintainers; [ gador ];
};
}
diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix
index fb3feaae63ee..82e1a645c853 100644
--- a/pkgs/development/python-modules/dragonfly/default.nix
+++ b/pkgs/development/python-modules/dragonfly/default.nix
@@ -5,7 +5,7 @@
, packaging
, pynput
, regex
-, lark-parser
+, lark
, enum34
, pyperclip
, six
@@ -34,7 +34,7 @@ buildPythonPackage rec {
};
postPatch = ''
- substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser'
+ substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark'
substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
substituteInPlace dragonfly/windows/x11_window.py \
@@ -48,7 +48,7 @@ buildPythonPackage rec {
packaging
pynput
regex
- lark-parser
+ lark
enum34
pyperclip
six
diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index b666e4c210f5..e8a94fb5e859 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dsmr-parser";
- version = "0.31";
+ version = "0.32";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "ndokter";
repo = "dsmr_parser";
rev = "v${version}";
- sha256 = "sha256-A+fyAAV62Dg28RDiivKEjrC1bCXzkuIvpATR+oUytRU=";
+ sha256 = "0hi69gdcmsp5yaspsfbpc3x76iybg20cylxyaxm131fpd5wwan9l";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix
index 006280376814..92081e08067c 100644
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "nschloe";
repo = pname;
- rev = version;
- sha256 = "0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
+ rev = "v${version}";
+ hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48";
};
format = "pyproject";
diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 601c5b68864d..73a3882927c2 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -12,11 +12,11 @@ buildPythonPackage (rec {
# there's a clear path forward. See
# https://github.com/elastic/elasticsearch-py/issues/1639 for more
# info.
- version = "7.16.2";
+ version = "7.16.3";
src = fetchPypi {
inherit pname version;
- sha256 = "23ac0afb4398c48990e359ac73ab6963741bd05321345299c62d9d23e209eee2";
+ sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e";
};
# Check is disabled because running them destroy the content of the local cluster!
diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix
new file mode 100644
index 000000000000..b6c31519efcd
--- /dev/null
+++ b/pkgs/development/python-modules/empty-files/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "empty-files";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "approvals";
+ repo = "EmptyFiles.Python";
+ rev = "v${version}";
+ sha256 = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ # cyclic dependency with approvaltests
+ doCheck = false;
+
+ pythonImportsCheck = [ "empty_files" ];
+
+ meta = with lib; {
+ description = "Null Object pattern for files";
+ homepage = "https://github.com/approvals/EmptyFiles.Python";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix
index cc1623177346..9e6a910b2ba9 100644
--- a/pkgs/development/python-modules/enaml/default.nix
+++ b/pkgs/development/python-modules/enaml/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "enaml";
- version = "0.14.0";
+ version = "0.14.1";
src = fetchFromGitHub {
owner = "nucleic";
repo = pname;
rev = version;
- sha256 = "sha256-u+T3jD/rulfWunWkCa02XKXYvDaB9oAnohgqrJXgtJw=";
+ sha256 = "sha256-QfI7cwl2c5HOlFNNdG+oOv48X9jJZnZNU/kWgutWe6k=";
};
# qt bindings cannot be found during tests
diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix
index 8f58720bd264..3c786d869155 100644
--- a/pkgs/development/python-modules/enlighten/default.nix
+++ b/pkgs/development/python-modules/enlighten/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "enlighten";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984";
+ sha256 = "7a5b83cd0f4d095e59d80c648ebb5f7ffca0cd8bcf7ae6639828ee1ad000632a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
index 66ff1ddc10ed..c98a0fc51529 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "eth-typing";
- version = "2.2.2";
+ version = "3.0.0";
# Tests are missing from the PyPI source tarball so let's use GitHub
# https://github.com/ethereum/eth-typing/issues/8
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "0rkvkacxla4y2blkkfdsq1ywnyqsvg8pwhvadznbag1bfzja4xhv";
+ sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY=";
};
# setuptools-markdown uses pypandoc which is broken at the moment
diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index 172647f0da70..9b26fb7024c0 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "eth-utils";
- version = "1.10.0";
+ version = "2.0.0";
# Tests are missing from the PyPI source tarball so let's use GitHub
# https://github.com/ethereum/eth-utils/issues/130
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-sq3H4HmUFUipqVYleZxWLG1gBsQEoNwcZAXiKckacek=";
+ sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw=";
};
checkInputs = [ pytestCheckHook hypothesis ];
diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 28caec986dcc..048edf64d38f 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "faker";
- version = "9.9.0";
+ version = "11.3.0";
src = fetchPypi {
pname = "Faker";
inherit version;
- hash = "sha256-cidwOj2zbtgkEQhUdUREX0WqRdsvP2PohcubVpk4Pw4=";
+ hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 451a993c22f8..3127ac0dcdbf 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -2,7 +2,7 @@
, aioredis
, async_generator
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, fetchpatch
, hypothesis
, lupa
@@ -18,17 +18,28 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.7.0";
- format = "setuptools";
+
+ format = "pyproject";
disabled = pythonOlder "3.7";
- src = fetchFromGitHub {
- owner = "jamesls";
- repo = pname;
- rev = version;
- hash = "sha256-P6PUg9SY0Qshlvj+iV1xdrzVLJ9JXUV4cGHUynKO3m0=";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE=";
};
+ patches = [
+ (fetchpatch {
+ # redis 4.1.0 compatibility
+ # https://github.com/jamesls/fakeredis/pull/324
+ url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch";
+ sha256 = "sha256:03xlqmwq8nkzisrjk7y51j2jd6qdin8nbj5n9hc4wjabbvlgx4qr";
+ excludes = [
+ "setup.cfg"
+ ];
+ })
+ ];
+
propagatedBuildInputs = [
aioredis
lupa
@@ -45,24 +56,15 @@ buildPythonPackage rec {
pytestCheckHook
];
- patches = [
- # Support for redis <= 4.1.0, https://github.com/jamesls/fakeredis/pull/324
- (fetchpatch {
- name = "support-redis-4.1.0.patch";
- url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch";
- sha256 = "sha256-4DrF/5WEWQWlJZtAi4qobMDyRAAcO/weHIaK9waN00k=";
- })
- ];
-
- disabledTestPaths = [
- # AttributeError: 'AsyncGenerator' object has no attribute XXXX
- "test/test_aioredis2.py"
- ];
-
pythonImportsCheck = [
"fakeredis"
];
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "redis<4.1.0" "redis"
+ '';
+
meta = with lib; {
description = "Fake implementation of Redis API";
homepage = "https://github.com/jamesls/fakeredis";
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index c1e988ca769a..53f2c15401ec 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -10,14 +10,18 @@
buildPythonPackage rec {
pname = "feedgenerator";
- version = "1.9.2";
+ version = "2.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s=";
+ sha256 = "6836d456b8b0edbc5b6d3a42d1be852cebd43d2f28af4ff51789eb295f1860e2";
};
+ postPatch = ''
+ sed -i '/cov/d' setup.cfg
+ '';
+
buildInputs = [
glibcLocales
];
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index d5ccc117beff..8eaed65ca73c 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "filelock";
- version = "3.3.0";
+ version = "3.4.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785";
+ sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix
new file mode 100644
index 000000000000..083abcaf6b8c
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, attrs
+, flake8
+, pytestCheckHook
+, hypothesis
+, hypothesmith
+}:
+
+buildPythonPackage rec {
+ pname = "flake8-bugbear";
+ version = "22.1.11";
+
+ src = fetchFromGitHub {
+ owner = "PyCQA";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc=";
+ };
+
+ propagatedBuildInputs = [
+ attrs
+ flake8
+ ];
+
+ checkInputs = [
+ flake8
+ pytestCheckHook
+ hypothesis
+ hypothesmith
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/PyCQA/flake8-bugbear";
+ changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log";
+ description = ''
+ A plugin for flake8 finding likely bugs and design problems in your
+ program.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ newam ];
+ };
+}
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index 8c7ae7d51b27..e4f88e176b9c 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -26,12 +26,12 @@
buildPythonPackage rec {
pname = "flask-appbuilder";
- version = "3.4.1";
+ version = "3.4.3";
src = fetchPypi {
pname = "Flask-AppBuilder";
inherit version;
- sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514";
+ sha256 = "be1e2271cdd7c879d343f57060b50ac411346730df55b35ce242faadcab81c12";
};
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 2fe71c2d6db9..cf1079166b08 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -7,6 +7,7 @@
, jinja2
, python-dotenv
, werkzeug
+, setuptools
, pytestCheckHook
}:
@@ -26,6 +27,10 @@ buildPythonPackage rec {
itsdangerous
jinja2
werkzeug
+
+ # required for CLI subcommand autodiscovery
+ # see: https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498
+ setuptools
];
checkInputs = [
diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix
index ae52c31b5775..11f3ad694fca 100644
--- a/pkgs/development/python-modules/flexmock/default.nix
+++ b/pkgs/development/python-modules/flexmock/default.nix
@@ -1,26 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
+, pytestCheckHook
+, pythonOlder
+, teamcity-messages
+, testtools
}:
buildPythonPackage rec {
pname = "flexmock";
- version = "0.11.1";
+ version = "0.11.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1c51371767f968e1d2f505138de72b07704ecebc9b34e0b52ffdeeb510685c3f";
+ hash = "sha256-RPcCwNCt3nCFtMev6a2rULAbckrO635Jsp9WMuYyXOg=";
};
- checkInputs = [ pytest ];
- checkPhase = ''
- py.test
- '';
+ checkInputs = [
+ pytestCheckHook
+ teamcity-messages
+ testtools
+ ];
+
+ disabledTests = [
+ "test_failed_test_case"
+ ];
+
+ pythonImportsCheck = [
+ "flexmock"
+ ];
meta = with lib; {
- description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes.";
+ description = "Testing library that makes it easy to create mocks,stubs and fakes";
homepage = "https://flexmock.readthedocs.org";
license = licenses.bsdOriginal;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix
index 70b97a083d8f..a670b4a9ba16 100644
--- a/pkgs/development/python-modules/flufl/i18n.nix
+++ b/pkgs/development/python-modules/flufl/i18n.nix
@@ -1,9 +1,14 @@
-{ buildPythonPackage, fetchPypi, atpublic }:
+{ buildPythonPackage, fetchPypi
+, atpublic
+, pdm-pep517
+}:
buildPythonPackage rec {
pname = "flufl.i18n";
- version = "3.2";
+ version = "4.0";
+ format = "pyproject";
+ nativeBuildInputs = [ pdm-pep517 ];
propagatedBuildInputs = [ atpublic ];
doCheck = false;
@@ -12,6 +17,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-w1yPjqtmrbf9ZKFCCGAQUGbSs2y2VbM/+xSv6OIj7WI=";
+ sha256 = "sha256-MTq0djhFp/cEx0Ezt5EaMz3MzrAWjxZ0HQSkfFuasWY=";
};
}
diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix
index c0f3ec60cf35..c2cc5723e4df 100644
--- a/pkgs/development/python-modules/flufl/lock.nix
+++ b/pkgs/development/python-modules/flufl/lock.nix
@@ -1,16 +1,19 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook
, atpublic, psutil, pytest-cov, sybil
+, pdm-pep517
}:
buildPythonPackage rec {
pname = "flufl.lock";
- version = "6.0";
+ version = "7.0";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-/HSO5gnshktIOO9knb0RcPp53rDCE8L9URUb7mp/wkI=";
+ sha256 = "sha256-FBX30Z2N2WpYJC4O+5DOPLGHf7VFB0rYwcrky3GR/gE=";
};
+ nativeBuildInputs = [ pdm-pep517 ];
propagatedBuildInputs = [ atpublic psutil ];
checkInputs = [ pytestCheckHook pytest-cov sybil ];
diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
index 139a4c562bbe..95c946a7751f 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -8,21 +8,16 @@
buildPythonPackage rec {
pname = "frozendict";
- version = "2.1.1";
+ version = "2.2.0";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "655b879217dd445a2023e16154cc231febef802b5c812d5c2e822280ad69e1dc";
+ sha256 = "sha256-jj1HNfmhPRB3Vn5WhHFmPzJE+FrImyP4yzHPIx2+Rbk=";
};
- postPatch = ''
- # fixes build on non-x86_64 architectures
- rm frozendict/src/3_9/cpython_src/Include/pyconfig.h
- '';
-
pythonImportsCheck = [
"frozendict"
];
@@ -32,24 +27,12 @@ buildPythonPackage rec {
];
preCheck = ''
- rm -r frozendict
- export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
+ pushd test
'';
- disabledTests = [
- # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict'
- "test_union"
- # non-standard assertions
- "test_repr"
- "test_format"
- "test_str"
- ];
-
- disabledTestPaths = [
- # unpackaged test dependency: coold
- "test/test_coold.py"
- "test/test_coold_subclass.py"
- ];
+ postCheck = ''
+ popd
+ '';
meta = with lib; {
homepage = "https://github.com/slezica/python-frozendict";
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index 8a7335accda4..115d358cb786 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, isPyPy, isPy3k, unittest2
+, isPyPy, isPy3k
}:
buildPythonPackage rec {
@@ -11,11 +11,14 @@ buildPythonPackage rec {
sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
};
- buildInputs = [ unittest2 ];
-
# https://github.com/testing-cabal/funcsigs/issues/10
patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];
+ # requires, unittest2 and package hasn't been maintained since 2013
+ doCheck = false;
+
+ pythonImportsCheck = [ "funcsigs" ];
+
meta = with lib; {
description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
homepage = "https://github.com/aliles/funcsigs";
diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix
index 956c7da93580..9dc336e17f15 100644
--- a/pkgs/development/python-modules/furo/default.nix
+++ b/pkgs/development/python-modules/furo/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "furo";
- version = "2021.10.9";
+ version = "2022.1.2";
format = "flit";
disable = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-K6pCoi7ePm6Vxhgqs2S6wuwVt5vH+cp/sJ/ZrsSzVAw=";
+ sha256 = "b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix
index a6351aeeadd7..c3541bcc30a0 100644
--- a/pkgs/development/python-modules/gaphas/default.nix
+++ b/pkgs/development/python-modules/gaphas/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "gaphas";
- version = "3.1.9";
+ version = "3.5.0";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-S6cRsfqXYM4mSVSs2M8fET5ShFClKkGkod2w2y6F2gc=";
+ sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index f374378d9865..110363b38322 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -1,24 +1,36 @@
{ lib
-, fetchFromGitHub
-, buildPythonPackage
, astunparse
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "gast";
- version = "0.5.1";
+ version = "0.5.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "serge-sans-paille";
- repo = "gast";
+ repo = pname;
rev = version;
- sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa";
+ sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg=";
};
- checkInputs = [ astunparse ];
+ checkInputs = [
+ astunparse
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "gast"
+ ];
meta = with lib; {
- description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.";
+ description = "Compatibility layer between the AST of various Python versions";
homepage = "https://github.com/serge-sans-paille/gast/";
license = licenses.bsd3;
maintainers = with maintainers; [ jyp cpcloud ];
diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix
index 4a25e0d7e148..338398714494 100644
--- a/pkgs/development/python-modules/gevent-socketio/default.nix
+++ b/pkgs/development/python-modules/gevent-socketio/default.nix
@@ -1,29 +1,48 @@
{ lib
, buildPythonPackage
, fetchPypi
-, versiontools
+, gevent
, gevent-websocket
, mock
-, pytest
-, gevent
+, versiontools
+, pythonOlder
}:
buildPythonPackage rec {
pname = "gevent-socketio";
version = "0.3.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak";
+ hash = "sha256-UzlKuT+9hNnbuyvvhTSfalA7/FPYapvoZTJQ8aBBKv8=";
};
- buildInputs = [ versiontools gevent-websocket mock pytest ];
- propagatedBuildInputs = [ gevent ];
+ nativeBuildInputs = [
+ versiontools
+ ];
+
+ buildInputs = [
+ gevent-websocket
+ ];
+
+ propagatedBuildInputs = [
+ gevent
+ ];
+
+ # Tests are not ported to Python 3
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "socketio"
+ ];
meta = with lib; {
+ description = "SocketIO server based on the Gevent pywsgi server";
homepage = "https://github.com/abourget/gevent-socketio";
- description = "SocketIO server based on the Gevent pywsgi server, a Python network library";
license = licenses.bsd0;
+ maintainers = with maintainers; [ ];
};
-
}
diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix
index 5e93fb32b9e7..66709d8fafa5 100644
--- a/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/pkgs/development/python-modules/gevent-websocket/default.nix
@@ -3,29 +3,37 @@
, fetchPypi
, gevent
, gunicorn
+, pythonOlder
}:
buildPythonPackage rec {
pname = "gevent-websocket";
version = "0.10.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky";
+ hash = "sha256-fq7zKWgpDJEh98Nblz4swwL/sHbQGMkGjS9cqLLYX7A=";
};
- propagatedBuildInputs = [ gevent gunicorn ];
+ propagatedBuildInputs = [
+ gevent
+ gunicorn
+ ];
- # zero tests run
+ # Module has no test
doCheck = false;
- pythonImportsCheck = [ "geventwebsocket" ];
+ pythonImportsCheck = [
+ "geventwebsocket"
+ ];
meta = with lib; {
+ description = "Websocket handler for the gevent pywsgi server";
homepage = "https://www.gitlab.com/noppo/gevent-websocket";
- description = "Websocket handler for the gevent pywsgi server, a Python network library";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
-
}
diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix
index 3fe9e648ce32..e2b1e11278b7 100644
--- a/pkgs/development/python-modules/gevent/default.nix
+++ b/pkgs/development/python-modules/gevent/default.nix
@@ -1,35 +1,50 @@
-{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet
+{ lib
+, fetchPypi
+, buildPythonPackage
+, isPyPy
+, python
+, libev
+, greenlet
+, zope_event
, zope_interface
+, pythonOlder
}:
buildPythonPackage rec {
pname = "gevent";
- version = "20.9.0";
+ version = "21.12.0";
format = "pyproject";
+ disabled = pythonOlder "3.7";
+
src = fetchPypi {
inherit pname version;
- sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz";
+ hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4=";
};
- buildInputs = [ libev ];
- propagatedBuildInputs = [
- zope_interface
- ] ++ lib.optionals (!isPyPy) [ greenlet ];
+ buildInputs = [
+ libev
+ ];
- checkPhase = ''
- cd greentest
- ${python.interpreter} testrunner.py
- '';
+ propagatedBuildInputs = [
+ zope_event
+ zope_interface
+ ] ++ lib.optionals (!isPyPy) [
+ greenlet
+ ];
# Bunch of failures.
doCheck = false;
+ pythonImportsCheck = [
+ "gevent"
+ ];
+
meta = with lib; {
description = "Coroutine-based networking library";
homepage = "http://www.gevent.org/";
license = licenses.mit;
- platforms = platforms.unix;
maintainers = with maintainers; [ bjornfor ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix
index 7e30b8e83f49..4a349106ac3f 100644
--- a/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -1,23 +1,25 @@
{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, backports_ssl_match_hostname
, brotli
+, buildPythonPackage
, certifi
-, gevent
-, six
, dpkt
+, fetchPypi
+, gevent
, pytestCheckHook
+, pythonOlder
+, six
}:
buildPythonPackage rec {
pname = "geventhttpclient";
version = "1.5.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780";
+ hash = "sha256-2A7J/0K3IZ8zVYGFSZ0LQ2VZf8Vf+IYge0X1Yy4Jl4A=";
};
propagatedBuildInputs = [
@@ -25,8 +27,6 @@ buildPythonPackage rec {
certifi
gevent
six
- ] ++ lib.optionals (pythonOlder "3.7") [
- backports_ssl_match_hostname
];
checkInputs = [
@@ -45,11 +45,14 @@ buildPythonPackage rec {
"test_multi_queries_greenlet_safe"
];
+ pythonImportsCheck = [
+ "geventhttpclient"
+ ];
+
meta = with lib; {
homepage = "https://github.com/gwik/geventhttpclient";
description = "HTTP client library for gevent";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
};
-
}
diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index a059495d00fe..2bab62fbcb10 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "gipc";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1";
+ sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo=";
};
propagatedBuildInputs = [ gevent ];
diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 469c0d613b90..52fdf6745c9f 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "glean_parser";
- version = "4.4.0";
+ version = "5.0.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5";
+ sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index e52f2def3954..f2c2f92c9f0d 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -12,17 +12,17 @@
buildPythonPackage rec {
pname = "glean-sdk";
- version = "43.0.2";
+ version = "44.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-9LLE7cUJhJ+0/rFtVkSdiXUohrXW0JFy3XcYMAAivfw=";
+ sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "sha256:1qi7zn2278jpry466w3xj1wpyy5f82bffi55i6nva591i3r1z4am";
+ sha256 = "sha256-lWFv8eiA3QHp5bhcg4qon/dvKUbFbtH1Q2oXGkk0Me0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index d251ec75ff59..91c959e87c5e 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "globus-sdk";
- version = "2.0.1";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "globus";
repo = "globus-sdk-python";
rev = version;
- sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9";
+ sha256 = "12zza78qydkgzqg3j9428g92v7bb55nrwvl5m2il96z39darh7v8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index e5bbbc8cbcde..772f45411d39 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "2.32.0";
+ version = "2.35.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "619fe50155e73342c17aba4bbb2a08be8ce6ae00b795af383de7d6616b485c94";
+ sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index b51a5569a595..9249b949b6e6 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "cachetools>=2.0.0,<5.0" "cachetools"
+ '';
+
propagatedBuildInputs = [
cachetools
pyasn1-modules
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index a90f9c73cc13..f77c718ed8b9 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage rec {
"download"
"get"
"post"
+ "upload"
"test_build_api_url"
"test_ctor_mtls"
"test_hmac_key_crud"
diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index 2b076f4cae02..227d49d57dbb 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
- version = "1.6.0";
+ version = "1.7.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
- sha256 = "sha256-qgowVCsSNa+Gt+fWnR1eMfkbtpZD7DS4ALZYz6KZZTM=";
+ sha256 = "sha256-SDxYPncC/VVTbI4Ka/mgcVfU1KUNRXVvQl78LCoD/RQ=";
};
propagatedBuildInputs = [
@@ -44,17 +44,17 @@ buildPythonPackage rec {
pytestCheckHook
];
- postPatch = ''
- substituteInPlace tests/event_media_test.py \
- --replace "/bin/echo" "${coreutils}/bin/echo"
- '';
-
pythonImportsCheck = [
"google_nest_sdm"
];
+ disabledTests = [
+ "test_clip_preview_transcode"
+ "test_event_manager_event_expiration_with_transcode"
+ ];
+
meta = with lib; {
- description = "Python module for Google Nest Device Access using the Smart Device Management API";
+ description = "Module for Google Nest Device Access using the Smart Device Management API";
homepage = "https://github.com/allenporter/python-google-nest-sdm";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix
index 0e17a81d4a73..5d5d2fda18a6 100644
--- a/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-nzDOf80TuO8Vmyy5WD1Km7mef3uFgWsRIFmwMvLwhKA=";
+ sha256 = "sha256-se37mIZ8n6Jap68S1kaGZbg8UytzSe/6uAWgJ+qLvuU=";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];
diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index 6a33cfd7b352..75583cdbfe39 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "graphql-core";
- version = "3.1.7";
+ version = "3.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = pname;
rev = "v${version}";
- sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l";
+ sha256 = "sha256-71Z+5nVvg+aozJAKmBGJg5Gqq1OIVH7Xv33Q82IHhXg=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix
index 18d6cd4dabb1..6347d9f55b8e 100644
--- a/pkgs/development/python-modules/growattserver/default.nix
+++ b/pkgs/development/python-modules/growattserver/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "growattserver";
- version = "1.1.0";
+ version = "1.2.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "indykoning";
repo = "PyPi_GrowattServer";
rev = version;
- sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY=";
+ sha256 = "0v9clmz4qg6krmbsbfsrhsan824y2mqvwxsxb0fzfgaszxwkpm30";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix
index 4718d8244d0c..f1e490a65cb2 100644
--- a/pkgs/development/python-modules/gruut/default.nix
+++ b/pkgs/development/python-modules/gruut/default.nix
@@ -18,12 +18,15 @@
let
langPkgs = [
+ "ar"
"cs"
"de"
- "es"
"en"
+ "es"
+ "fa"
"fr"
"it"
+ "lb"
"nl"
"pt"
"ru"
@@ -45,9 +48,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
- --replace "Babel~=2.8.0" "Babel" \
--replace "dateparser~=1.0.0" "dateparser" \
- --replace "gruut_lang_en~=2.0.0" "gruut_lang_en"
+ --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" \
+ --replace "jsonlines~=1.2.0" "jsonlines"
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 330172f56cee..d500c6453213 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
- ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*'
+ nosetests -e 'ext_test_\d.*'
'';
pythonImportsCheck = [ "gssapi" ];
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index a391d993cf0c..c02e3b593b82 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "gst-python";
- version = "1.18.4";
+ version = "1.20.0";
format = "other";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
- sha256 = "13h9qzfz8s1gyj2ar9q2gf5346sgdv6jv8hj7aw0hpl2gs5f0s6b";
+ sha256 = "j2e9xWBrozYGxryJbonefc2M9PykWfcTibG2/gdbXlQ=";
};
# Python 2.x is not supported.
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 5bcfb64a184d..1616343f8b43 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "gym";
- version = "0.19.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "openai";
repo = pname;
- rev = version;
- sha256 = "sha256-0O/s9OVNGQmeX9j8B1x63RxdI6dhqfTEJcgDH2jtCv4=";
+ rev = "v${version}";
+ sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index fcd283621493..13d38a14b5b6 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -2,7 +2,6 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
-, fetchpatch
, hpack
, hyperframe
, pytestCheckHook
@@ -11,24 +10,16 @@
buildPythonPackage rec {
pname = "h2";
- version = "4.0.0";
+ version = "4.1.0";
format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d";
+ sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs=";
};
- patches = [
- # Workaround issues with hypothesis 6.6
- # https://github.com/python-hyper/h2/pull/1248
- (fetchpatch {
- url = "https://github.com/python-hyper/h2/commit/0646279dab694a89562846c810202ce2c0b49be3.patch";
- sha256 = "1k0fsxwq9wbv15sc9ixls4qmxxghlzpflf3awm66ar9m2ikahiak";
- })
- ];
-
propagatedBuildInputs = [
hpack
hyperframe
@@ -48,5 +39,6 @@ buildPythonPackage rec {
description = "HTTP/2 State-Machine based protocol implementation";
homepage = "http://hyper.rtfd.org/";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 701b8f78f83b..36b1322a88b3 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -20,7 +20,8 @@ in buildPythonPackage rec {
# avoid strict pinning of numpy
postPatch = ''
substituteInPlace setup.py \
- --replace "numpy ==" "numpy >="
+ --replace "numpy ==" "numpy >=" \
+ --replace "mpi4py ==" "mpi4py >="
'';
HDF5_DIR = "${hdf5}";
diff --git a/pkgs/development/python-modules/ha-av/default.nix b/pkgs/development/python-modules/ha-av/default.nix
index af5f5f31ab61..78735b67d44d 100644
--- a/pkgs/development/python-modules/ha-av/default.nix
+++ b/pkgs/development/python-modules/ha-av/default.nix
@@ -3,7 +3,7 @@
, pythonOlder
, fetchPypi
, pkg-config
-, ffmpeg
+, ffmpeg_4
}:
buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
];
buildInputs = [
- ffmpeg
+ ffmpeg_4
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix
index e24f2fc09691..9dc3193957f6 100644
--- a/pkgs/development/python-modules/habanero/default.nix
+++ b/pkgs/development/python-modules/habanero/default.nix
@@ -1,24 +1,32 @@
{ buildPythonPackage, lib, fetchFromGitHub
, requests, tqdm
, nose, vcrpy
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "habanero";
- version = "0.7.4";
+ version = "1.0.0";
# Install from Pypi is failing because of a missing file (Changelog.rst)
src = fetchFromGitHub {
owner = "sckott";
repo = pname;
rev = "v${version}";
- sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1";
+ sha256 = "0lhbd5c4sypcd65nh4cgxddsqrxwg89nn1qiii6m5l4fzsvblggv";
};
propagatedBuildInputs = [ requests tqdm ];
- checkInputs = [ nose vcrpy ];
- checkPhase = "make test";
+ # almost the entirety of the test suite makes network calls
+ pytestFlagsArray = [
+ "test/test-filters.py"
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ vcrpy
+ ];
meta = {
description = "Python interface to Library Genesis";
diff --git a/pkgs/development/python-modules/hdlparse/default.nix b/pkgs/development/python-modules/hdlparse/default.nix
deleted file mode 100644
index 4257f9b2e9a2..000000000000
--- a/pkgs/development/python-modules/hdlparse/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
- pname = "hdlparse";
- version = "1.0.4";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "fb6230ed1e7a04a8f82f8d3fb59791d0751ae35e5b8e58dbbf2cbcf100d0d0f2";
- };
-
- #This module does not contain any tests.
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://kevinpt.github.io/hdlparse/";
- description = "Rudimentary parser for VHDL and Verilog";
- license = licenses.mit;
- maintainers = with maintainers; [ elliottvillars ];
- };
-}
-
diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix
index ef029586bebf..111d7e00d1b2 100644
--- a/pkgs/development/python-modules/html-sanitizer/default.nix
+++ b/pkgs/development/python-modules/html-sanitizer/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "html-sanitizer";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "matthiask";
repo = pname;
rev = version;
- sha256 = "sha256-ZPyGF7N+EZHfgqZfRQx4x1r83BMur+Zg2kdtVISn3I8=";
+ sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
index ace9a7041e3f..8359fcf0a096 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -1,33 +1,65 @@
{ lib
+, brotlipy
, buildPythonPackage
+, decorator
, fetchPypi
, flask
, flask-limiter
-, markupsafe
-, decorator
, itsdangerous
+, markupsafe
, raven
, six
-, brotlipy
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "httpbin";
version = "0.7.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb";
+ hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo=";
};
- propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ];
+ propagatedBuildInputs = [
+ brotlipy
+ flask
+ flask-limiter
+ markupsafe
+ decorator
+ itsdangerous
+ raven
+ six
+ ];
- # No tests
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "test_httpbin.py"
+ ];
+
+ disabledTests = [
+ # Tests seems to be outdated
+ "test_anything"
+ "test_get"
+ "test_redirect_n_equals_to_1"
+ "test_redirect_n_higher_than_1"
+ "test_redirect_to_post"
+ "test_relative_redirect_n_equals_to_1"
+ "test_relative_redirect_n_higher_than_1"
+ ];
+
+ pythonImportsCheck = [
+ "httpbin"
+ ];
meta = with lib; {
+ description = "HTTP Request and Response Service";
homepage = "https://github.com/kennethreitz/httpbin";
- description = "HTTP Request & Response Service";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index 99eb08a35a9d..79d979b10a97 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "httpcore";
- version = "0.14.3";
+ version = "0.14.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo=";
+ sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix
index b3ac17cf7f07..40ef250401bf 100644
--- a/pkgs/development/python-modules/httpx-ntlm/default.nix
+++ b/pkgs/development/python-modules/httpx-ntlm/default.nix
@@ -3,29 +3,35 @@
, cryptography
, fetchPypi
, httpx
-, ntlm-auth
+, pyspnego
+, pythonOlder
}:
buildPythonPackage rec {
pname = "httpx-ntlm";
- version = "0.0.10";
+ version = "1.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "httpx_ntlm";
inherit version;
- sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz";
+ sha256 = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ=";
};
propagatedBuildInputs = [
cryptography
httpx
- ntlm-auth
+ pyspnego
];
# https://github.com/ulodciv/httpx-ntlm/issues/5
doCheck = false;
- pythonImportsCheck = [ "httpx_ntlm" ];
+ pythonImportsCheck = [
+ "httpx_ntlm"
+ ];
meta = with lib; {
description = "NTLM authentication support for HTTPX";
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 543308a3fdc1..d479cc1f13ce 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -1,11 +1,11 @@
{ lib
+, async_generator
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, brotlicffi
, certifi
, charset-normalizer
-, h2
, httpcore
, rfc3986
, sniffio
@@ -20,24 +20,27 @@
buildPythonPackage rec {
pname = "httpx";
- version = "0.21.1";
+ version = "0.21.3";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc=";
+ sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9";
};
propagatedBuildInputs = [
brotlicffi
certifi
charset-normalizer
- h2
httpcore
rfc3986
sniffio
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ async_generator
];
checkInputs = [
@@ -49,13 +52,21 @@ buildPythonPackage rec {
uvicorn
];
- pythonImportsCheck = [ "httpx" ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3"
+ '';
# testsuite wants to find installed packages for testing entrypoint
preCheck = ''
export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
'';
+ pytestFlagsArray = [
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+
disabledTests = [
# httpcore.ConnectError: [Errno 101] Network is unreachable
"test_connect_timeout"
@@ -71,6 +82,10 @@ buildPythonPackage rec {
"tests/test_main.py"
];
+ pythonImportsCheck = [
+ "httpx"
+ ];
+
__darwinAllowLocalNetworking = true;
meta = with lib; {
diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix
index 28a801de71a6..38c25fa1b0c8 100644
--- a/pkgs/development/python-modules/huey/default.nix
+++ b/pkgs/development/python-modules/huey/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "huey";
- version = "2.2.0";
+ version = "2.4.2";
src = fetchFromGitHub {
owner = "coleifer";
repo = pname;
rev = version;
- sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh";
+ sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg";
};
propagatedBuildInputs = [ redis ];
diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix
index 5f3842835364..dc165f2b2cc4 100644
--- a/pkgs/development/python-modules/hypercorn/default.nix
+++ b/pkgs/development/python-modules/hypercorn/default.nix
@@ -8,6 +8,7 @@
, h2
, priority
, mock
+, poetry-core
, pytest-asyncio
, pytest-cov
, pytest-sugar
@@ -17,16 +18,21 @@
buildPythonPackage rec {
pname = "Hypercorn";
- version = "0.11.2";
+ version = "0.13.2";
disabled = pythonOlder "3.7";
+ format = "pyproject";
src = fetchFromGitLab {
owner = "pgjones";
repo = pname;
rev = version;
- sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh";
+ sha256 = "sha256-fIjw5A6SvFUv8cU7xunVlPYphv+glypY4pzvHNifYLQ=";
};
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
propagatedBuildInputs = [ wsproto toml h2 priority ]
++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index c282be29c655..719efb92d1da 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -36,6 +36,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pytestFlagsArray = [
+ # pytest-asyncio 0.17.0 compat
+ "--asyncio-mode=auto"
+ ];
+
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --timeout=9 --cov=hyperion" ""
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 9d9c6b6c91fa..89aac153172d 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -9,6 +9,7 @@
, pytest-xdist
, sortedcontainers
, tzdata
+, pythonOlder
}:
buildPythonPackage rec {
# https://hypothesis.readthedocs.org/en/latest/packaging.html
@@ -18,14 +19,16 @@ buildPythonPackage rec {
# If you need these, you can just add them to your environment.
pname = "hypothesis";
- version = "6.30.1";
+ version = "6.35.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
- # Use github tarballs that includes tests
src = fetchFromGitHub {
owner = "HypothesisWorks";
repo = "hypothesis-python";
rev = "hypothesis-python-${version}";
- sha256 = "0nk57v03q7ss7dbsfd9gi3lzl6ngplk7axbiksm26dgkhh4swk8y";
+ sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527";
};
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
@@ -35,8 +38,13 @@ buildPythonPackage rec {
sortedcontainers
];
- checkInputs = [ pytestCheckHook pytest-xdist pexpect ]
- ++ lib.optional (pythonAtLeast "3.9") tzdata;
+ checkInputs = [
+ pexpect
+ pytest-xdist
+ pytestCheckHook
+ ] ++ lib.optional (pythonAtLeast "3.9") [
+ tzdata
+ ];
inherit doCheck;
@@ -45,10 +53,16 @@ buildPythonPackage rec {
rm tox.ini
'';
- pytestFlagsArray = [ "tests/cover" ];
+ pytestFlagsArray = [
+ "tests/cover"
+ ];
+
+ pythonImportsCheck = [
+ "hypothesis"
+ ];
meta = with lib; {
- description = "A Python library for property based testing";
+ description = "Library for property based testing";
homepage = "https://github.com/HypothesisWorks/hypothesis";
license = licenses.mpl20;
maintainers = with maintainers; [ SuperSandro2000 ];
diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index 776ff77fce2f..3ce0f068fec9 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, hypothesis, lark-parser, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }:
+{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }:
buildPythonPackage rec {
pname = "hypothesmith";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
};
- propagatedBuildInputs = [ hypothesis lark-parser libcst ];
+ propagatedBuildInputs = [ hypothesis lark libcst ];
checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index d5805e94e794..b4bd659f9872 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
- version = "2.4.8";
+ version = "2.4.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MrlFTUNisT5VG8IUIk/qejkM7tV6qrU4ASBzAUCLWpQ=";
+ sha256 = "sha256-4pFkysb0gxgb1oYirTnvQgjEStJkzUn0Ktw33ZP7zA4=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index a249b2dbfe19..6998ff330afc 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -3,7 +3,7 @@
, isPy3k
, fetchPypi
, substituteAll
-, ffmpeg
+, ffmpeg_4
, python
}:
@@ -21,7 +21,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./ffmpeg-path.patch;
- ffmpeg = "${ffmpeg}/bin/ffmpeg";
+ ffmpeg = "${ffmpeg_4}/bin/ffmpeg";
})
];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
${python.interpreter} << EOF
from imageio_ffmpeg import get_ffmpeg_version
- assert get_ffmpeg_version() == '${ffmpeg.version}'
+ assert get_ffmpeg_version() == '${ffmpeg_4.version}'
EOF
runHook postCheck
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 5727b52755a6..98495932fdaf 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -13,23 +13,14 @@
buildPythonPackage rec {
pname = "imageio";
- version = "2.13.5";
+ version = "2.14.1";
disabled = isPy27;
src = fetchPypi {
- sha256 = "0gc41aiz2i0napk1y00v9bgb4m7dd21sz3lghfm6w6s0ivjjpv67";
+ sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg=";
inherit pname version;
};
- patches = [
- # already present in master, remove on next bump
- (fetchpatch {
- name = "pillow-9-gif-rgba.patch";
- url = "https://github.com/imageio/imageio/commit/836b7a9b077a96de8adab5b67ea53b1292048275.patch";
- sha256 = "0rlyppa4w16n6qn5hr4wrg8xiy7ifs8c5dhmq8a9yncypx87glpv";
- })
- ];
-
propagatedBuildInputs = [
imageio-ffmpeg
numpy
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index a607de5eb114..13b26e337ac2 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "importlib-metadata";
- version = "4.10.0";
+ version = "4.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "importlib_metadata";
inherit version;
- hash = "sha256-kqi1jOc0sqRJSHjg7PfXnM16EotfxgFMQB4LYfAG8PY=";
+ hash = "sha256-lR8NiltyYOnbXkHUKShbX0UekoR58Z2AgYh4Un026V4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix
index 84e381f0b8c8..dd2db106acea 100644
--- a/pkgs/development/python-modules/inquirer/default.nix
+++ b/pkgs/development/python-modules/inquirer/default.nix
@@ -1,30 +1,48 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# native
+, poetry-core
+
+# propagated
+, blessed
+, python-editor
+, readchar
+
+# tests
+, pytest-mock
+, pytestCheckHook
+, pexpect
+}:
buildPythonPackage rec {
pname = "inquirer";
- version = "2.7.0";
+ version = "2.9.1";
+ format = "pyproject";
- # PyPi archive currently broken: https://github.com/magmax/python-inquirer/issues/106
src = fetchFromGitHub rec {
owner = "magmax";
repo = "python-inquirer";
- rev = version;
- sha256 = "152l5qjgkag8zkr69ax2i5s8xcac1qvyngisrplbnbzwbpf77d0d";
+ rev = "v${version}";
+ sha256 = "sha256:0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233";
};
- propagatedBuildInputs = [ blessed python-editor readchar ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
- postPatch = ''
- substituteInPlace requirements.txt \
- --replace "blessed==1.17.6" "blessed~=1.17" \
- --replace "readchar==2.0.1" "readchar>=2.0.0"
- '';
+ propagatedBuildInputs = [
+ blessed
+ python-editor
+ readchar
+ ];
- checkInputs = [ pytest pytest-cov pexpect pytest-mock ];
-
- checkPhase = ''
- pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration
- '';
+ checkInputs = [
+ pexpect
+ pytest-mock
+ pytestCheckHook
+ ];
meta = with lib; {
homepage = "https://github.com/magmax/python-inquirer";
diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix
index cd8dfe3fb6fb..bc33a2389164 100644
--- a/pkgs/development/python-modules/intellifire4py/default.nix
+++ b/pkgs/development/python-modules/intellifire4py/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "intellifire4py";
- version = "0.7.3";
+ version = "0.9.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = pname;
rev = version;
- hash = "sha256-vOARk7TZrpsJLt8Ofur1NxknejmmxmH4Z+30mev4++o=";
+ hash = "sha256-cNWsKwXVlnZgPjkll1IaEhDHfHNvWCBY6U3B34IdHd0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 1a34dfaf65b2..0827e611679e 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "ipykernel";
- version = "6.6.0";
+ version = "6.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3a227788216b43982d9ac28195949467627b0d16e6b8af9741d95dcaa8c41a89";
+ sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index 4c64fca34b76..51b76fc532bb 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "ipyparallel";
- version = "6.3.0";
+ version = "8.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0a97b276c62db633e9e97a816282bdd166f9df74e28204f0c8fa54b71944cfdc";
+ sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73";
};
buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index 73ead288ee49..cee9868cfacb 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -3,65 +3,79 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
+
# Build dependencies
, glibcLocales
-# Test dependencies
-, nose
-, pygments
+
# Runtime dependencies
-, jedi
-, decorator
-, matplotlib-inline
-, pickleshare
-, traitlets
-, prompt-toolkit
-, pexpect
, appnope
, backcall
+, black
+, decorator
+, jedi
+, matplotlib-inline
+, pexpect
+, pickleshare
+, prompt-toolkit
+, pygments
+, stack-data
+, traitlets
+
+# Test dependencies
+, pytestCheckHook
+, testpath
}:
buildPythonPackage rec {
pname = "ipython";
- version = "7.30.1";
- disabled = pythonOlder "3.7";
+ version = "8.0.1";
+ format = "pyproject";
+ disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97";
+ sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb";
};
- prePatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace setup.py --replace "'gnureadline'" " "
- '';
-
- buildInputs = [ glibcLocales ];
-
- checkInputs = [ nose pygments ];
+ buildInputs = [
+ glibcLocales
+ ];
propagatedBuildInputs = [
- jedi
+ backcall
+ black
decorator
+ jedi
matplotlib-inline
+ pexpect
pickleshare
- traitlets
prompt-toolkit
pygments
- pexpect
- backcall
- ] ++ lib.optionals stdenv.isDarwin [appnope];
+ stack-data
+ traitlets
+ ] ++ lib.optionals stdenv.isDarwin [
+ appnope
+ ];
LC_ALL="en_US.UTF-8";
- doCheck = false; # Circular dependency with ipykernel
-
- checkPhase = ''
- nosetests
- '';
-
pythonImportsCheck = [
"IPython"
];
+ preCheck = ''
+ export HOME=$TMPDIR
+
+ # doctests try to fetch an image from the internet
+ substituteInPlace pytest.ini \
+ --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py"
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ testpath
+ ];
+
meta = with lib; {
description = "IPython: Productive Interactive Computing";
homepage = "http://ipython.org/";
diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix
index 037a5f0520fd..3cd86abb0b2e 100644
--- a/pkgs/development/python-modules/irctokens/default.nix
+++ b/pkgs/development/python-modules/irctokens/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "irctokens";
- version = "2.0.0";
+ version = "2.0.1";
disabled = pythonOlder "3.6"; # f-strings
src = fetchFromGitHub {
owner = "jesopo";
repo = pname;
rev = "v${version}";
- sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb";
+ sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U=";
};
checkInputs = [ pyyaml ];
diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
index f708391cba21..d21f79b6ba9b 100644
--- a/pkgs/development/python-modules/isort/default.nix
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "isort";
- version = "5.9.3";
+ version = "5.10.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "PyCQA";
repo = "isort";
rev = version;
- sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw=";
+ sha256 = "09spgl2k9xrprr5gbpfc91a8p7mx7a0c64ydgc91b3jhrmnd9jg1";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix
index c8a9efdb54f8..f4c52db722cd 100644
--- a/pkgs/development/python-modules/janus/default.nix
+++ b/pkgs/development/python-modules/janus/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "janus";
- version = "0.7.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845";
+ sha256 = "df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612";
};
disabled = pythonOlder "3.6";
diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
index 46f2bfdff3fc..d45d354b38e7 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -4,10 +4,10 @@
buildPythonPackage rec {
pname = "jaraco.collections";
- version = "3.4.0";
+ version = "3.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9";
+ sha256 = "b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88";
};
pythonNamespaces = [ "jaraco" ];
diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix
index 1316c2b4e729..73aa7708cf25 100644
--- a/pkgs/development/python-modules/jaraco_functools/default.nix
+++ b/pkgs/development/python-modules/jaraco_functools/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "jaraco.functools";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8";
+ sha256 = "31e0e93d1027592b7b0bec6ad468db850338981ebee76ba5e212e235f4c7dda0";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index c7d8207aa3d9..b22f5ccd73a4 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "jira";
- version = "3.0.1";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "pycontribs";
repo = pname;
rev = version;
- sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE=";
+ sha256 = "04s2zgwxip54g894hps2cm081cp07mbi7qipmsv4dvailhsg43nn";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix
index 2f7921374e75..9f247c2d7569 100644
--- a/pkgs/development/python-modules/johnnycanencrypt/default.nix
+++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix
@@ -18,20 +18,20 @@
buildPythonPackage rec {
pname = "johnnycanencrypt";
- version = "0.5.0";
+ version = "0.6.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "kushaldas";
repo = "johnnycanencrypt";
rev = "v${version}";
- sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4";
+ sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit patches src;
name = "${pname}-${version}";
- hash = "sha256-2XhXCKyXVlFgbcOoMy/A5ajiIVxBii56YeI29mO720U=";
+ hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY=";
};
format = "pyproject";
diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix
index c091480f63c6..036b60e9eca2 100644
--- a/pkgs/development/python-modules/josepy/default.nix
+++ b/pkgs/development/python-modules/josepy/default.nix
@@ -1,28 +1,25 @@
{ lib
-, fetchPypi
, buildPythonPackage
, cryptography
+, fetchPypi
, pyopenssl
-, setuptools
-, mock
, pytestCheckHook
+, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "josepy";
- version = "1.11.0";
+ version = "1.12.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d";
+ sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25";
};
- postPatch = ''
- # remove coverage flags
- sed -i '/addopts/d' pytest.ini
- sed -i '/flake8-ignore/d' pytest.ini
- '';
-
propagatedBuildInputs = [
pyopenssl
cryptography
@@ -30,15 +27,23 @@ buildPythonPackage rec {
];
checkInputs = [
- mock
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace pytest.ini \
+ --replace " --flake8 --cov-report xml --cov-report=term-missing --cov=josepy --cov-config .coveragerc" ""
+ sed -i '/flake8-ignore/d' pytest.ini
+ '';
+
+ pythonImportsCheck = [
+ "josepy"
+ ];
+
meta = with lib; {
description = "JOSE protocol implementation in Python";
homepage = "https://github.com/jezdez/josepy";
license = licenses.asl20;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ ];
};
}
-
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix
index 442267b52ea0..92c78895eb62 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/pkgs/development/python-modules/jpylyzer/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "jpylyzer";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "openpreserve";
repo = pname;
rev = version;
- sha256 = "01wfbb1bgby9b7m6q7483kvpyc1qhj80dg8d5a6smcxvmy8y6x5n";
+ sha256 = "1cd9klq83g9p4nkg7x78axqid5vcsqzggp431hcfdiixa50yjxjg";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index d16fa89a97c4..4892d72aae91 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "jsonlines";
- version = "1.2.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "wbolster";
repo = pname;
rev = version;
- sha256 = "1f8zsqy8p9a41gqg2a5x7sppc5qhhq7gw58id2aigb270yxzs7jw";
+ sha256 = "1242bvk208vjaw8zl1d7ydb0i05v8fwdgi92d3bi1vaji9s2hv65";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index b78165fc4f32..dd2a47f1bcb6 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -1,38 +1,59 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27
+{ lib
, attrs
-, functools32
+, buildPythonPackage
+, fetchPypi
, importlib-metadata
-, mock
-, nose
+, importlib-resources
, pyperf
, pyrsistent
+, pytestCheckHook
+, pythonOlder
, setuptools-scm
, twisted
-, vcversioner
+, typing-extensions
}:
buildPythonPackage rec {
pname = "jsonschema";
- version = "3.2.0";
+ version = "4.4.0";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";
+ sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83";
};
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ];
- checkInputs = [ nose mock pyperf twisted vcversioner ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
- # zope namespace collides on py27
- doCheck = !isPy27;
- checkPhase = ''
- nosetests
- '';
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ attrs
+ pyrsistent
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ typing-extensions
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ importlib-resources
+ ];
+
+ checkInputs = [
+ pyperf
+ pytestCheckHook
+ twisted
+ ];
+
+ pythonImportsCheck = [
+ "jsonschema"
+ ];
meta = with lib; {
- homepage = "https://github.com/Julian/jsonschema";
description = "An implementation of JSON Schema validation for Python";
+ homepage = "https://github.com/Julian/jsonschema";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar ];
};
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index a90fa0eb9a13..66344e408a8f 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -149,6 +149,8 @@ buildPythonPackage rec {
"test_upgrade"
# Testcase fails to find requests import
"test_external_service"
+ # attempts to do ssl connection
+ "test_connection_notebook_wrong_certs"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index 46c76ebfe20e..9d2907072e62 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "jupyterlab-git";
- version = "0.34.0";
+ version = "0.34.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "jupyterlab_git";
inherit version;
- sha256 = "3b9ee3a577834c0f021d41069be7b03068297ce0c2a73c76b17e8018eb3eb62f";
+ sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
index 92b341a591c7..26794fbc77b5 100644
--- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "jupyterlab-widgets";
- version = "1.0.2";
+ version = "2.0.0b1";
src = fetchPypi {
pname = "jupyterlab_widgets";
inherit version;
- sha256 = "7885092b2b96bf189c3a705cc3c412a4472ec5e8382d0b47219a66cccae73cfa";
+ sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 88c3d39ccf0e..3280e7ec2840 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jupyterlab";
- version = "3.2.6";
+ version = "3.2.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb";
+ sha256 = "5e4e99868c4f385372686767781408acbb9004b690b198b45597ba869802334b";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 777f82a3e5ad..368cc19fdd94 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "jupytext";
- version = "1.13.5";
+ version = "1.13.6";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "mwouts";
repo = pname;
rev = "v${version}";
- sha256 = "0rapp2baqml1z3n8k7ijf5461b3p8wgr45y3njz54q75v0jk7v45";
+ sha256 = "0xvc4i3wwycaqx16qylglywa14ky7mikdv1jm3p7yz19cq5hr0fx";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
index f7d4738ebcab..d5a906dd733b 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
@@ -17,13 +17,13 @@ let
in
buildPythonPackage rec {
pname = "kaldi-active-grammar";
- version = "2.1.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "daanzu";
repo = pname;
rev = "v${version}";
- sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY=";
+ sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk";
};
KALDI_BRANCH = "foo";
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index ba7579d10670..c89782d4027e 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "labelbox";
- version = "3.10.0";
+ version = "3.11.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Labelbox";
repo = "labelbox-python";
rev = "v${version}";
- sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9";
+ sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark/default.nix
similarity index 81%
rename from pkgs/development/python-modules/lark-parser/default.nix
rename to pkgs/development/python-modules/lark/default.nix
index c1c67fd4c1ea..6c29a662524c 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark/default.nix
@@ -6,19 +6,26 @@
}:
buildPythonPackage rec {
- pname = "lark-parser";
- version = "0.12.0";
+ pname = "lark";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
- sha256 = "sha256-zcMGCn3ixD3dJg3GlC/ijs+U1JN1BodHLTXZc/5UR7Y=";
+ sha256 = "0pfvjh4ydc49gs6m8b3ip85c8nd4da2bhz9714fwcyl3hdp33q7n";
};
# Optional import, but fixes some re known bugs & allows advanced regex features
propagatedBuildInputs = [ regex ];
+ pythonImportsCheck = [
+ "lark"
+ "lark.parsers"
+ "lark.tools"
+ "lark.grammars"
+ ];
+
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix
index 09232cbc6242..0619a62fa32d 100644
--- a/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "lazy-object-proxy";
- version = "1.6.0";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726";
+ sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix
index a094bf6b37e6..f88e14d0a3e7 100644
--- a/pkgs/development/python-modules/lektor/default.nix
+++ b/pkgs/development/python-modules/lektor/default.nix
@@ -24,13 +24,13 @@
buildPythonPackage rec {
pname = "lektor";
- version = "3.1.3";
+ version = "3.3.1";
src = fetchFromGitHub {
owner = "lektor";
repo = "lektor";
rev = version;
- sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx";
+ sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 5b251f842bff..7a7e116aa221 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -1,21 +1,32 @@
-{ lib, fetchPypi, buildPythonPackage, pytest }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, poetry-core
+, pytestCheckHook
+, pkgs
+}:
buildPythonPackage rec {
pname = "libtmux";
- version = "0.10.2";
+ version = "0.10.3";
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "a0e958b85ec14cdaabecfa738a0dd51846f05e5c5e9d6749a2bf5160b9f7e1d2";
+ src = fetchFromGitHub {
+ owner = "tmux-python";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256:0syj8m4x2mcq96b76b7h75dsmcai22m15pfgkk90rpg7rp6sn772";
};
- checkInputs = [ pytest ];
- postPatch = ''
- sed -i 's/==.*$//' requirements/test.txt
- '';
+ nativeBuildInputs = [
+ poetry-core
+ ];
- # No tests in archive
- doCheck = false;
+ checkInputs = [
+ pkgs.procps
+ pkgs.tmux
+ pytestCheckHook
+ ];
meta = with lib; {
description = "Scripting library for tmux";
diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index f1b474b960f6..da84d890eced 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libusb1";
- version = "2.0.1";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46";
+ sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index 4c4f7a32133b..9a19dda15789 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "limits";
- version = "1.6";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6c0a57b42647f1141f5a7a0a8479b49e4367c24937a01bd9d4063a595c2dd48a";
+ sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index e3b9e3bb7c8a..637a4deb3abb 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "llvmlite";
- version = "0.37.0";
+ version = "0.38.0";
disabled = isPyPy || !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15";
+ sha256 = "a99d166ccf3b116f3b9ed23b9b70ba2415640a9c978f3aaa13fad49c58f4965c";
};
nativeBuildInputs = [ llvm ];
diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix
index 42cf477ca160..2004f962098b 100644
--- a/pkgs/development/python-modules/locationsharinglib/default.nix
+++ b/pkgs/development/python-modules/locationsharinglib/default.nix
@@ -6,7 +6,6 @@
, emoji
, fetchPypi
, nose
-, python
, pythonOlder
, pytz
, requests
@@ -46,7 +45,7 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
# Only coverage no real unit tests
- ${python.interpreter} setup.py nosetests
+ nosetests
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix
index 16060c1c030e..d16b06a284ab 100644
--- a/pkgs/development/python-modules/loo-py/default.nix
+++ b/pkgs/development/python-modules/loo-py/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "loo-py";
- version = "2017.2";
+ version = "2020.2";
src = fetchPypi {
pname = "loo.py";
inherit version;
- sha256 = "c656992de48b328cdaccd7d1f14eb522b9dd5a1d0d15f54623f4ab18fd219abc";
+ sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 1aeaa04e1721..9887f42bd8f3 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
- version = "0.26.1";
+ version = "0.27.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d8525f74de51554b5c8491effe036f60629a426229befa33ff614c8569a16a73";
+ sha256 = "1521b129564444648c523a38f6446c137f1aae5c9c7de1ec151d5ebf03fd407d";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 80719e1076b5..97b52855f6ba 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -7,7 +7,7 @@
, bubblewrap
, exiftool
, ffmpeg
-, mime-types
+, mailcap
, wrapGAppsHook
, gdk-pixbuf
, gobject-introspection
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 69721aeb8280..12c7813ba4b1 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -40,7 +40,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"'
+ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \
+ --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \
# Remove after https://github.com/poljar/matrix-nio/pull/288
substituteInPlace pyproject.toml \
--replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"'
diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix
index e9b74d02b070..54f8431ba279 100644
--- a/pkgs/development/python-modules/meshio/default.nix
+++ b/pkgs/development/python-modules/meshio/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "meshio";
- version = "4.4.6";
+ version = "5.2.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "0kv832s2vyff30zz8yqypw5jifwdanvh5x56d2bzkvy94h4jlddy";
+ sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index c157cd2a6be8..2c78575d3704 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -20,12 +20,12 @@
}:
buildPythonPackage rec {
- version = "4.3.1";
+ version = "5.1.0";
pname = "Mezzanine";
src = fetchPypi {
inherit pname version;
- sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3";
+ sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265";
};
disabled = isPyPy || lib.versionOlder django.version "1.11"
diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix
index 0de5077ebee8..814a93e9c544 100644
--- a/pkgs/development/python-modules/mistletoe/default.nix
+++ b/pkgs/development/python-modules/mistletoe/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "mistletoe";
- version = "0.8.1";
+ version = "0.8.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "468c6a42fd98b85e05b318033f63d76e02712e1ea1328a7ebcba7e47fb6f1e41";
+ sha256 = "sha256-ouNU5lPym8r1WZ2JSFEhGaxgN+nC+O53851VRQ59Gmw=";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix
index 4692dc61c229..05fc6b4bb59a 100644
--- a/pkgs/development/python-modules/mlxtend/default.nix
+++ b/pkgs/development/python-modules/mlxtend/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "mlxtend";
- version = "0.17.3";
+ version = "0.19.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rasbt";
repo = pname;
rev = version;
- sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl";
+ sha256 = "0qawzlzv4zf612n9n03fxnz6gxmzschq0ykh9dgv70l33ihmjbaw";
};
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index afef1cb5724d..1a0b7ee907bc 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -19,12 +19,12 @@
buildPythonPackage rec {
pname = "mocket";
- version = "3.10.3";
+ version = "3.10.4";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "82634f7d1a39f6a340ff9c7486e37bf3698e6510fdcfa7b378b5fbb256a42cda";
+ sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969";
};
propagatedBuildInputs = [
@@ -45,6 +45,8 @@ buildPythonPackage rec {
pook
];
+ # skip http tests
+ SKIP_TRUE_HTTP = true;
pytestFlagsArray = [
# Requires a live Redis instance
"--ignore=tests/main/test_redis.py"
diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix
index 36d798e5504d..16205286c003 100644
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "monty";
- version = "2021.12.1";
+ version = "2022.1.12.1";
disabled = pythonOlder "3.5"; # uses type annotations
src = fetchFromGitHub {
owner = "materialsvirtuallab";
repo = pname;
rev = "v${version}";
- sha256 = "0zcbdh7pqv4dq3fan0zh912w9bvmf2p0zj1fhp0ayhdsc50cwldh";
+ sha256 = "11bp3zkmqffc6rqw93qfk8d905mzc10nqbjmvj2bay8h197q0dg2";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 4d9156349e4a..a998e7b74b41 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -6,6 +6,7 @@
, cfn-lint
, docker
, flask
+, flask-cors
, freezegun
, jinja2
, jsondiff
@@ -24,15 +25,16 @@
, idna
, nose
, pytestCheckHook
+, pytest-xdist
}:
buildPythonPackage rec {
pname = "moto";
- version = "1.3.16";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0zy0prsyip264i6h03lxsn1qg1n3dc8c4iyfawckjqvm24gnns3c";
+ sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k=";
};
postPatch = ''
@@ -42,22 +44,6 @@ buildPythonPackage rec {
--replace "MarkupSafe<2.0" "MarkupSafe" \
'';
- patches = [
- # Remove dependence on boto. The boto library (long ago superseded by boto3)
- # has not had an official release in over two years or even a commit in the
- # last 18 months. These patches should be included in the next moto release
- # after 1.3.16
- (fetchpatch {
- url = "https://github.com/spulec/moto/pull/3503/commits/ae85c539fd57034c4d5cfd0f95af41ff19862dd1.patch";
- sha256 = "16hr2py6q701d8ih6zcvs3lbanshpbk15ixckgdqngjf160k5m9p";
- excludes = ["tests/test_ec2/test_ec2_cloudformation.py"];
- })
- (fetchpatch {
- url = "https://github.com/spulec/moto/pull/3468/commits/6ee39bd7fda4d3623569e10dcd9561bf2cd1d0bd.patch";
- sha256 = "10m3xdqxgys7spav9mkbhcn4z0124rlprwxnw6ysb10610xlna0i";
- })
- ];
-
propagatedBuildInputs = [
aws-xray-sdk
boto3
@@ -80,8 +66,15 @@ buildPythonPackage rec {
idna
] ++ lib.optionals isPy27 [ backports_tempfile ];
- # Next release after 1.3.16 will not require `nose`
- checkInputs = [ boto3 nose freezegun pytestCheckHook sure parameterized ];
+ checkInputs = [
+ boto3
+ flask-cors
+ freezegun
+ parameterized
+ pytestCheckHook
+ pytest-xdist
+ sure
+ ];
# Multiple test files still import boto, rather than boto3 like
# boto is long-deprecated and broken on python3.9
@@ -89,6 +82,7 @@ buildPythonPackage rec {
# NOTE: This should change to use disabledTestFiles / disabledTestPaths once that
# feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700
pytestFlagsArray = [
+ "-n $NIX_BUILD_CORES"
"--ignore=tests/test_awslambda/test_policy.py"
"--ignore=tests/test_autoscaling/test_autoscaling.py"
"--ignore=tests/test_autoscaling/test_cloudformation.py"
@@ -226,6 +220,12 @@ buildPythonPackage rec {
"--ignore=tests/test_swf/responses/test_timeouts.py"
"--ignore=tests/test_swf/responses/test_workflow_executions.py"
"--ignore=tests/test_swf/responses/test_workflow_types.py"
+ # attempts web connections
+ "--ignore=tests/test_appsync/test_appsync_schema.py"
+ "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py"
+ "--ignore=tests/test_awslambda/test_lambda_invoke.py"
+ "--ignore=tests/test_batch/test_batch_jobs.py"
+ "--ignore=tests/**/*_integration.py"
];
disabledTests = [
@@ -256,6 +256,14 @@ buildPythonPackage rec {
"test_get_records_seq"
"test_stream_with_range_key"
"test_create_notebook_instance_bad_volume_size"
+ "http_destination"
+ "test_invoke_function_from_sqs_exception"
+ "test_state_machine_list_executions_with_pagination"
+ "test_put_subscription_filter_with_lambda"
+ "test_create_custom_lambda_resource__verify_cfnresponse_failed"
+ "test_state_machine_creation_fails_with_invalid_names"
+ # needs graphql
+ "test_get_schema_creation_status"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix
index 8d17d8b3b0cf..282d4a71c962 100644
--- a/pkgs/development/python-modules/mpd2/default.nix
+++ b/pkgs/development/python-modules/mpd2/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "python-mpd2";
- version = "3.0.4";
+ version = "3.0.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs";
+ sha256 = "sha256-bxv/2TuaMvwBipu/NIdQW1Lg11fsNAZpBcYKkS1JI4Q=";
};
buildInputs = [ mock ];
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 6e8fd896d913..aa5a74c2cfe8 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -2,19 +2,13 @@
buildPythonPackage rec {
pname = "mpi4py";
- version = "3.0.3";
+ version = "3.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
+ sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg=";
};
- patches = [ (fetchpatch {
- name = "disable-broken-test"; # upstream patch
- url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch";
- sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx";
- })];
-
passthru = {
inherit mpi;
};
diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix
index fa2fa87d0e89..e511ab100459 100644
--- a/pkgs/development/python-modules/multiset/default.nix
+++ b/pkgs/development/python-modules/multiset/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "multiset";
- version = "2.1.1";
+ version = "3.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7";
+ sha256 = "e45671cae8385a8e6248a9b07a3a83280c2d0cc4312713058cfbacdc5ec9973e";
};
buildInputs = [ setuptools-scm pytest-runner ];
diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix
index 0a8252234569..b47c6701a008 100644
--- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "mypy-boto3-builder";
- version = "5.5.0";
+ version = "6.3.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "vemel";
repo = "mypy_boto3_builder";
rev = version;
- sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I=";
+ sha256 = "1krsh8pmxigpzz21gvsy7qnpnwfkyyjbz92bqp9iflf7kklfhb79";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
index e7aa7de0c9d8..54829a67908a 100644
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
- version = "1.20.28";
+ version = "1.20.35.post1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "85ac23d06f9d0d794f60041b4c4f271d2bb8f5a83375c963e4a9e73e51ba9ca5";
+ sha256 = "e576fa0f3d1ea9ce53ad620ee565962687cdae5d8f1f8414db0669aed788836c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix
index fdcfed839c78..9fe1fa8abe10 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -2,14 +2,14 @@
buildPythonApplication rec {
pname = "mypy-protobuf";
- version = "2.10";
+ version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1fed214e16351b09946770794a321a818abb744078b1d863a479da070028684c";
+ sha256 = "558dcc390290e43c7def0d4238cc41a79abde06ff509b3014c3dff0553c7b0c1";
};
propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ];
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index 0e6630281c0d..2c062d3ff99e 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, python
, notebook
, pythonOlder
, jupyter_server
@@ -10,19 +11,26 @@
buildPythonPackage rec {
pname = "nbclassic";
- version = "0.3.1";
+ version = "0.3.5";
disabled = pythonOlder "3.6";
# tests only on github
src = fetchFromGitHub {
owner = "jupyterlab";
repo = pname;
- rev = version;
- sha256 = "sha256-gx086w/qYB02UFEDly+0mUsV5BvAVAuhqih4wev2p/w=";
+ rev = "v${version}";
+ sha256 = "1d0x7nwsaw5qjw4iaylc2sxlpiq3hlg9sy3i2nh7sn3wckwl76lc";
};
propagatedBuildInputs = [ jupyter_server notebook ];
+ preCheck = ''
+ cd nbclassic
+ mv conftest.py tests
+ cd tests
+
+ export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
+ '';
checkInputs = [
pytestCheckHook
pytest-tornasync
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index c10b442bac92..c5e3facc0622 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "nbclient";
- version = "0.5.9";
- disabled = pythonOlder "3.6";
+ version = "0.5.10";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA=";
+ sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088";
};
inherit doCheck;
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 400d59272ee1..ab91f22acc44 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "nbconvert";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a";
+ sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5";
};
# Add $out/share/jupyter to the list of paths that are used to search for
diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix
index a7c5425963aa..7d1d827cc20f 100644
--- a/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/pkgs/development/python-modules/nbsmoke/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "nbsmoke";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32";
+ sha256 = "8b55333e2face27bc7ff80c266c468ca5633947cb0697727348020dd445b0874";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 91195abce1cd..60f5fcde63fe 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
- version = "3.2.1";
+ version = "3.2.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "4d2ff9426b740011a1c916b54fc25da9348282e727eaa2ea163f42e00f1fc29e";
+ sha256 = "sha256-sNzBdLMEBc6ej+weqzy7sg9cXkkgl2wIsi4FC3wST5Q=";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 27e17daa372a..9beeb4cb0a69 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,4 +1,7 @@
-{ fetchPypi, buildPythonPackage, lib, isPy3k
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pythonOlder
, click
, joblib
, regex
@@ -6,13 +9,16 @@
}:
buildPythonPackage rec {
- version = "3.6.7";
pname = "nltk";
+ version = "3.7";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3";
+ hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI=";
};
propagatedBuildInputs = [
@@ -30,10 +36,14 @@ buildPythonPackage rec {
# best.
doCheck = false;
- meta = {
+ pythonImportsCheck = [
+ "nltk"
+ ];
+
+ meta = with lib; {
description = "Natural Language Processing ToolKit";
homepage = "http://nltk.org/";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ lheckemann ];
+ license = licenses.asl20;
+ maintainers = with maintainers; [ lheckemann ];
};
}
diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix
index 456bbfd9aedd..451c71897da9 100644
--- a/pkgs/development/python-modules/nose/default.nix
+++ b/pkgs/development/python-modules/nose/default.nix
@@ -14,6 +14,19 @@ buildPythonPackage rec {
sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
};
+ # 2to3 was removed in setuptools 58
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'use_2to3': True," ""
+
+ substituteInPlace setup3lib.py \
+ --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3"
+ '';
+
+ preBuild = ''
+ 2to3 -wn nose functional_tests unit_tests
+ '';
+
propagatedBuildInputs = [ coverage ];
doCheck = false; # lot's of transient errors, too much hassle
diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 1cb5f1b75708..7a1902cb2114 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -27,12 +27,12 @@
buildPythonPackage rec {
pname = "notebook";
- version = "6.4.6";
+ version = "6.4.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3";
+ sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a";
};
LC_ALL = "en_US.utf8";
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index c45419c5c88c..8bead014e34a 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -12,13 +12,13 @@
}:
buildPythonPackage rec {
- version = "0.54.1";
+ version = "0.55.0";
pname = "numba";
disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "f9dfc803c864edcc2381219b800abf366793400aea55e26d4d5b7d953e14f43f";
+ sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 31b529c83dab..ffc422e9b421 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -1,32 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
-, python
, numpy
+, packaging
+, python
+, pythonOlder
}:
buildPythonPackage rec {
pname = "numexpr";
- version = "2.8.0";
+ version = "2.8.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9fec076b76c90a5f3929373f548834bb203c6d23a81a895e60d0fe9cca075e99";
+ hash = "sha256-zXeapE3ZhsTvEBY1GSOWArAnvgalJ5RmViB6zx9YETs=";
};
- # Remove existing site.cfg, use the one we built for numpy.
- preBuild = ''
- ln -s ${numpy.cfg} site.cfg
- '';
-
nativeBuildInputs = [
numpy
];
propagatedBuildInputs = [
numpy
+ packaging
];
+ preBuild = ''
+ # Remove existing site.cfg, use the one we built for numpy
+ ln -s ${numpy.cfg} site.cfg
+ '';
+
checkPhase = ''
runtest="$(pwd)/numexpr/tests/test_numexpr.py"
pushd "$out"
@@ -34,9 +40,14 @@ buildPythonPackage rec {
popd
'';
- meta = {
+ pythonImportsCheck = [
+ "numexpr"
+ ];
+
+ meta = with lib; {
description = "Fast numerical array expression evaluator for NumPy";
homepage = "https://github.com/pydata/numexpr";
- license = lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 945828fbc19f..2fbe1a7a694c 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -40,14 +40,19 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.21.4";
+
+ # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so
+ # build both to verify they don't break.
+ # https://github.com/scipy/scipy/issues/15414
+ version = "1.21.5";
+
format = "pyproject.toml";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0";
+ sha256 = "sha256-alkovGJBJk3OXtUJ5m8zZ2/Jf0ZOepGe3GcvtVMiIe4=";
};
patches = lib.optionals python.hasDistutilsCxxPatch [
diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix
index 8c4c8e1fbc5f..f4cc9d3140e4 100644
--- a/pkgs/development/python-modules/nunavut/default.nix
+++ b/pkgs/development/python-modules/nunavut/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "nunavut";
- version = "1.5.2";
+ version = "1.6.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "12703306872404be556648ab2282dc1566f4e77bfb9f14747fb13294c9235081";
+ sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 2278133582c6..b262f4b84dd1 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "oci";
- version = "2.53.1";
+ version = "2.54.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "v${version}";
- hash = "sha256-TnLKT/F36jHEfT9K6DFM2GmPRccXz1GJWIF+EEQYRls=";
+ hash = "sha256-LTfJSlVT4I00ftshU0mbtxzy92G8lOmQiKMTMC+ZFHk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix
index 54c5c6c165b2..76019730eb70 100644
--- a/pkgs/development/python-modules/oletools/default.nix
+++ b/pkgs/development/python-modules/oletools/default.nix
@@ -39,6 +39,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0"
+ '';
+
disabledTests = [
# Test fails with AssertionError: Tuples differ: ('MS Word 2007+...
"test_all"
diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix
index 18e357c1f2d2..8251c2cd0175 100644
--- a/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, poetry-core
, pytestCheckHook
, isodate
, jsonschema
@@ -13,13 +14,20 @@
buildPythonPackage rec {
pname = "openapi-schema-validator";
- version = "0.1.5";
+ version = "0.2.0";
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "a4b2712020284cee880b4c55faa513fbc2f8f07f365deda6098f8ab943c9f0df";
+ src = fetchFromGitHub {
+ owner = "p1c2u";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA=";
};
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ];
checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ];
diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
new file mode 100644
index 000000000000..797a524e0172
--- /dev/null
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, dulwich
+, pbr
+, sphinx
+}:
+
+buildPythonPackage rec {
+ pname = "openstackdocstheme";
+ version = "2.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-zzWgAozJrYMFyGWzoDLYbeoY+IPlgzmVhnX7lgM6BXs=";
+ };
+
+ postPatch = ''
+ # only a small portion of the listed packages are actually needed for running the tests
+ # so instead of removing them one by one remove everything
+ rm test-requirements.txt
+ '';
+
+ propagatedBuildInputs = [ dulwich pbr sphinx ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "openstackdocstheme" ];
+
+ meta = with lib; {
+ description = "Sphinx theme for RST-sourced documentation published to docs.openstack.org";
+ homepage = "https://github.com/openstack/openstackdocstheme";
+ license = licenses.asl20;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index dd2d69a0c23d..a2e6eac8e389 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -10,7 +10,7 @@
, pbr
, pyinotify
, python-dateutil
-, stestr
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -36,12 +36,13 @@ buildPythonPackage rec {
checkInputs = [
oslotest
- stestr
+ pytestCheckHook
];
- checkPhase = ''
- stestr run
- '';
+ disabledTests = [
+ # not compatible with sandbox
+ "test_logging_handle_error"
+ ];
pythonImportsCheck = [ "oslo_log" ];
diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index 1db266e116d4..865bd45c61b3 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -5,6 +5,7 @@
, future
, numpy
, qdldl
+, setuptools-scm
, scipy
# check inputs
, pytestCheckHook
@@ -13,14 +14,16 @@
buildPythonPackage rec {
pname = "osqp";
- version = "0.6.2.post0";
+ version = "0.6.2.post5";
src = fetchPypi {
inherit pname version;
- sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc";
+ sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61";
};
- nativeBuildInputs = [ cmake ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [ cmake setuptools-scm ];
dontUseCmakeConfigure = true;
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix
index 42615fa664dd..1e60872b2c1b 100644
--- a/pkgs/development/python-modules/ovoenergy/default.nix
+++ b/pkgs/development/python-modules/ovoenergy/default.nix
@@ -8,14 +8,16 @@
buildPythonPackage rec {
pname = "ovoenergy";
- version = "1.1.12";
+ version = "1.2.0";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "timmo001";
repo = pname;
rev = "v${version}";
- sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz";
+ hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI=";
};
propagatedBuildInputs = [
@@ -26,7 +28,9 @@ buildPythonPackage rec {
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "ovoenergy" ];
+ pythonImportsCheck = [
+ "ovoenergy"
+ ];
meta = with lib; {
description = "Python client for getting data from OVO's API";
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 880a5afdce63..536f883f29a2 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -27,12 +27,12 @@
buildPythonPackage rec {
pname = "pandas";
- version = "1.3.4";
+ version = "1.3.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc";
+ sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index d271111d58f2..d7be0348d54a 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "paramiko";
- version = "2.9.1";
+ version = "2.9.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-of3e07VfYdIzieT+UtmuQolgrJWNLt9QNz+qXYkm7dA=";
+ sha256 = "944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index e39993194a8c..436192e18b8d 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "pelican";
- version = "4.6.0";
+ version = "4.7.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "getpelican";
repo = pname;
rev = version;
- sha256 = "0xrz0cmjyaylr81rmy5i3qbp4ms1iwh0gpb07q1dwljffb8xzbhr";
+ sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix
index c168e087fc5c..d6205fc6e72e 100644
--- a/pkgs/development/python-modules/pep257/default.nix
+++ b/pkgs/development/python-modules/pep257/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pep257";
- version = "0.7.0";
+ version = "6.1.1";
src = fetchFromGitHub {
owner = "GreenSteam";
repo = "pep257";
rev = version;
- sha256 = "sha256-RkE9kkNkRTmZ8zJVwQzMsxU1hcjlxX6UA+ehnareynQ=";
+ sha256 = "0hcf3nyvzl8kd6gmc9qsiigz7vpwrjxcd1bd50dd63cad87qqicg";
};
checkInputs = [ pytestCheckHook mock ];
diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix
index 90dc50461990..ad58cdb72d4d 100644
--- a/pkgs/development/python-modules/pep517/default.nix
+++ b/pkgs/development/python-modules/pep517/default.nix
@@ -2,11 +2,12 @@
, buildPythonPackage
, fetchPypi
, flit-core
-, toml
+, tomli
, pythonOlder
, importlib-metadata
, zipp
, pytestCheckHook
+, setuptools
, testpath
, mock
, pip
@@ -14,12 +15,12 @@
buildPythonPackage rec {
pname = "pep517";
- version = "0.9.1";
+ version = "0.12.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf";
+ sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0";
};
nativeBuildInputs = [
@@ -27,18 +28,24 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
- toml
+ tomli
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata zipp
];
checkInputs = [
pytestCheckHook
+ setuptools
testpath
mock
pip
];
+ disabledTests = [
+ "test_setup_py"
+ "test_issue_104"
+ ];
+
preCheck = ''
rm pytest.ini # wants flake8
rm tests/test_meta.py # wants to run pip
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix
index af653ed0c8da..ca8f867e6e30 100644
--- a/pkgs/development/python-modules/perfplot/default.nix
+++ b/pkgs/development/python-modules/perfplot/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, flit-core
, dufte
, matplotlib
, numpy
@@ -13,16 +14,20 @@
buildPythonPackage rec {
pname = "perfplot";
- version = "0.9.8";
+ version = "0.9.13";
+ format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nschloe";
repo = pname;
- rev = version;
- sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d";
+ rev = "v${version}";
+ sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6";
};
- format = "pyproject";
+
+ nativeBuildInputs = [
+ flit-core
+ ];
propagatedBuildInputs = [
dufte
@@ -44,5 +49,6 @@ buildPythonPackage rec {
homepage = "https://github.com/nschloe/perfplot";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
+ broken = true; # missing matplotx dependency
};
}
diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 438360260822..bb275b0e0e14 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pex";
- version = "2.1.56";
+ version = "2.1.62";
format = "flit";
src = fetchPypi {
inherit pname version;
- sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53";
+ sha256 = "b69743e72c879b2d145560fc0a52ff57e7db6e7ca657c3db50e5845e46294783";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix
index 54a816643818..29f7266b6910 100644
--- a/pkgs/development/python-modules/phonemizer/default.nix
+++ b/pkgs/development/python-modules/phonemizer/default.nix
@@ -12,11 +12,11 @@
buildPythonApplication rec {
pname = "phonemizer";
- version = "2.2.2";
+ version = "3.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ae252f0bc7633e172b08622f318e7e112cde847e9281d4675ea7210157325146";
+ sha256 = "1b4ea53b8da9a156361dff1d0c04ac1a8e65e6966d1cb9a8147c200960b32296";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index 7645fdaec8aa..6637198b5643 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pivy";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchFromGitHub {
owner = "coin3d";
repo = "pivy";
rev = version;
- sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx";
+ sha256 = "1xlynrbq22pb252r37r80b3myzap8hzhvknz4zfznfrsg9ykh8k2";
};
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index c4811044ae2b..fbe869b07032 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "5.4.0";
+ version = "5.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161";
+ sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index a3aabdc568a9..6acd81854681 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pontos";
- version = "22.2.1";
+ version = "22.2.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
- hash = "sha256-VMfvlqpmA2Mg/llVNcY3Enuuq3mwV0G1GYrpbvzo8pU=";
+ hash = "sha256-9QnimA9y5mVgJA9LkDVC+eNyp6Ltvw+fErtoSVL/1iw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix
index 52e46cec75a0..a3cb25624f7a 100644
--- a/pkgs/development/python-modules/portend/default.nix
+++ b/pkgs/development/python-modules/portend/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "portend";
- version = "2.7.2";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3fbc0df9e4970b661e4d7386a91fc7bcf34ebeaf0333ce15d819d515a71ba8b2";
+ sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix
index 90ed4b34b707..fd7bf7bc09c3 100644
--- a/pkgs/development/python-modules/portpicker/default.nix
+++ b/pkgs/development/python-modules/portpicker/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "portpicker";
- version = "1.4.0";
+ version = "1.5.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "c2831ff4328a21e928ffc9e52124bcafacaf5816d38a1a72dc329680dc1bb7ba";
+ sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228";
};
meta = {
diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix
index 86c7b61ae27f..8bc7ecb7f355 100644
--- a/pkgs/development/python-modules/pot/default.nix
+++ b/pkgs/development/python-modules/pot/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "pot";
- version = "0.8.0";
+ version = "0.8.1.0";
src = fetchPypi {
pname = "POT";
inherit version;
- sha256 = "a70e092ddc5a29a4b526192750604a634dfc2faa1641664b4c2c1c00b3cd63cf";
+ sha256 = "ff2974418fbf35b18072555c2a9e7e4f6876eddfb6791179ddb8f0f6d6032505";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index 85aaa1e656d8..f914a0f3df44 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "prettytable";
- version = "2.4.0";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca";
+ sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 766b7090f90f..3f4f49d4299e 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "progressbar2";
- version = "3.55.0";
+ version = "4.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04";
+ sha256 = "14d3165a1781d053ffaa117daf27cc706128d2ec1d2977fdb05b6bb079888013";
};
propagatedBuildInputs = [ python-utils ];
diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix
index 418e63ec9330..e38560be2eb6 100644
--- a/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "prompt-toolkit";
- version = "3.0.23";
+ version = "3.0.24";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "prompt_toolkit";
inherit version;
- sha256 = "7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf";
+ sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index ba17c5eca737..581e83ddf1a2 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "psutil";
- version = "5.8.0";
+ version = "5.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c";
+ sha256 = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25";
};
# We have many test failures on various parts of the package:
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 34660a84cd60..bdf2b65cb507 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "psycopg2";
- version = "2.9.2";
+ version = "2.9.3";
# Extension modules don't work well with PyPy. Use psycopg2cffi instead.
# c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea";
+ sha256 = "8e841d1bf3434da985cc5ef13e6f75c8981ced601fd70cc6bf33351b91562981";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix
index 6e35cb573586..69d776f90039 100644
--- a/pkgs/development/python-modules/pulsectl/default.nix
+++ b/pkgs/development/python-modules/pulsectl/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pulsectl";
- version = "21.10.5";
+ version = "22.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2";
+ sha256 = "sha256-icAIrRgLX/WNqSit/6/423/pVLzA55wlFRcUHlgvEVk=";
};
patches = [
diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index e363cd412d66..3d2e1b05e101 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "py-synologydsm-api";
- version = "1.0.5";
+ version = "1.0.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "mib1185";
repo = "synologydsm-api";
rev = "v${version}";
- sha256 = "sha256-mm5N2RKn2KP2dV7+dw0sNWlCDT5X/fRmH8POQqJIoZY=";
+ sha256 = "sha256-jAdD6FCbsBocJNX7o+dpthgHaPLIueFWJMzBNoKAq7w=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index f55c869a7a2c..391afabf931f 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976";
+ sha256 = "sha256-5vIjVqvr/+Cok9z3L+CaDIve2tb0mMVaMMPdMs5Ijmo=";
};
propagatedBuildInputs = [ aiohttp requests ];
diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix
index 6ca3166fb19e..bf46734df514 100644
--- a/pkgs/development/python-modules/pyamg/default.nix
+++ b/pkgs/development/python-modules/pyamg/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyamg";
- version = "4.1.0";
+ version = "4.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b4cacfcfd13379762a4551ac059a2e52a093b476ca1ad44b9202e736490a8863";
+ sha256 = "48d9be622049d8363cda84125c45d18b89e0ab7d99be5a93c0246f375ebad344";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix
index d2ed7d6ff34a..a06d2a05fb40 100644
--- a/pkgs/development/python-modules/pyatag/default.nix
+++ b/pkgs/development/python-modules/pyatag/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyatag";
- version = "0.3.5.3";
+ version = "3.5.1";
disabled = isPy27;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "MatsNl";
repo = "pyatag";
rev = version;
- sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6";
+ sha256 = "17x2m7icbby1y2zfc79jpbir2kvyqlrkix9pvvxanm658arsh8c7";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index d93bfe149cb8..46c1307826ef 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -8,18 +8,18 @@
, python
, catch
, numpy
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pybind11";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchFromGitHub {
owner = "pybind";
repo = pname;
rev = "v${version}";
- hash = "sha256-zYDgXXpn8Z1Zti8Eje8qxDvbQV70/LmezG3AtxzDG+o=";
+ hash = "sha256-wBvEWQlZhHoSCMbGgYtB3alWBLA8mA8Mz6JPLhXa3Pc=";
};
nativeBuildInputs = [ cmake ];
@@ -49,16 +49,18 @@ buildPythonPackage rec {
checkInputs = [
catch
numpy
- pytest
+ pytestCheckHook
];
- checkPhase = ''
- runHook preCheck
-
- make check
-
- runHook postCheck
- '';
+ disabledTestPaths = [
+ # require dependencies not available in nixpkgs
+ "tests/test_embed/test_trampoline.py"
+ "tests/test_embed/test_interpreter.py"
+ # numpy changed __repr__ output of numpy dtypes
+ "tests/test_numpy_dtypes.py"
+ # no need to test internal packaging
+ "tests/extra_python_package/test_files.py"
+ ];
meta = with lib; {
homepage = "https://github.com/pybind/pybind11";
diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix
deleted file mode 100644
index af9f18aad2c6..000000000000
--- a/pkgs/development/python-modules/pycallgraph/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-}:
-
-buildPythonPackage rec {
- pname = "pycallgraph";
- version = "1.0.1";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0w8yr43scnckqcv5nbyd2dq4kpv74ai856lsdsf8iniik07jn9mi";
- };
-
- buildInputs = [ pytest ];
-
- # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118
- doCheck = false;
-
- meta = with lib; {
- homepage = "http://pycallgraph.slowchop.com";
- description = "Call graph visualizations for Python applications";
- maintainers = with maintainers; [ auntie ];
- license = licenses.gpl2;
- };
-
-}
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index f9a4b24ffcd6..f5921d0dfd20 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pychromecast";
- version = "10.2.2";
+ version = "10.2.3";
format = "setuptools";
disabled = !isPy3k;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
- sha256 = "bd1dbb9383ed549d42d12f337a6c664a9088b4910ebb3f11de6fe15f397e7efd";
+ sha256 = "ddb86c5acdc13e8bdadd2b7f5738fda36b32c1750548f7b629ca8d178f05e0da";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index 868504e39949..560c5a708122 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pycountry";
- version = "20.7.3";
+ version = "22.1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241";
+ sha256 = "b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix
index 00e36ec37312..8dccfbc2610d 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/pkgs/development/python-modules/pydot/default.nix
@@ -4,19 +4,33 @@
, substituteAll
, graphviz
, python
+, pytestCheckHook
, chardet
+, pythonOlder
, pyparsing
}:
buildPythonPackage rec {
pname = "pydot";
version = "1.4.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d";
};
+ propagatedBuildInputs = [
+ pyparsing
+ ];
+
+ checkInputs = [
+ chardet
+ pytestCheckHook
+ ];
+
patches = [
(substituteAll {
src = ./hardcode-graphviz-path.patch;
@@ -27,21 +41,31 @@ buildPythonPackage rec {
postPatch = ''
# test_graphviz_regression_tests also fails upstream: https://github.com/pydot/pydot/pull/198
substituteInPlace test/pydot_unittest.py \
- --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests"
+ --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" \
+ # Patch path for pytestCheckHook
+ substituteInPlace test/pydot_unittest.py \
+ --replace "shapefile_dir = os.path.join(test_dir, 'from-past-to-future')" "shapefile_dir = 'test/from-past-to-future'" \
+ --replace "path = os.path.join(test_dir, TESTS_DIR_1)" "path = os.path.join('test/', TESTS_DIR_1)"
'';
- propagatedBuildInputs = [ pyparsing ];
+ pytestFlagsArray = [
+ "test/pydot_unittest.py"
+ ];
- checkInputs = [ chardet ];
+ disabledTests = [
+ "test_exception_msg"
+ # Hash mismatch
+ "test_my_regression_tests"
+ ];
- checkPhase = ''
- cd test
- ${python.interpreter} pydot_unittest.py
- '';
+ pythonImportsCheck = [
+ "pydot"
+ ];
- meta = {
+ meta = with lib; {
+ description = "Allows to create both directed and non directed graphs from Python";
homepage = "https://github.com/erocarrera/pydot";
- description = "Allows to easily create both directed and non directed graphs from Python";
- license = lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix
index b59aa56c48e9..7f51f435ada9 100644
--- a/pkgs/development/python-modules/pyerfa/default.nix
+++ b/pkgs/development/python-modules/pyerfa/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pyerfa";
format = "pyproject";
- version = "2.0.0";
+ version = "2.0.0.1";
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0=";
+ sha256 = "2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index eb5eb993ef48..29803793fd6f 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "4.5.3";
+ version = "4.5.4";
pname = "pyfakefs";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397";
+ sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix
index 8fdb051a4846..77ddabe2057e 100644
--- a/pkgs/development/python-modules/pyfcm/default.nix
+++ b/pkgs/development/python-modules/pyfcm/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pyfcm";
- version = "1.4.7";
+ version = "1.4.8";
src = fetchFromGitHub {
owner = "olucurious";
repo = "pyfcm";
rev = version;
- sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg";
+ sha256 = "15q6p21wsjm75ccmzcsgad1w9fgk6189hbrp7pawpxl7l3qxn2p7";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix
index 99506de1026a..a481e9a97a89 100644
--- a/pkgs/development/python-modules/pyflunearyou/default.nix
+++ b/pkgs/development/python-modules/pyflunearyou/default.nix
@@ -27,6 +27,11 @@ buildPythonPackage rec {
sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU=";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"'
+ '';
+
nativeBuildInputs = [
poetry-core
];
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 3c0552ef4d3c..3780122f19f7 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "pygraphviz";
- version = "1.8";
+ version = "1.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- hash = "sha256-6y4losZHBE57ZrWhWb5k2q7yS1Sfz1NcJBNp1ubgnEU=";
+ hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw=";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index fd6ba2f2df98..a4c04ce79ee6 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "PyHamcrest";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316";
+ sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db";
};
checkInputs = [ mock pytest ];
diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix
index f69a21115f27..aa967b76954a 100644
--- a/pkgs/development/python-modules/pyhocon/default.nix
+++ b/pkgs/development/python-modules/pyhocon/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "pyhocon";
- version = "0.3.58";
+ version = "0.3.59";
src = fetchFromGitHub {
owner = "chimpler";
repo = "pyhocon";
rev = version;
- sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU=";
+ sha256 = "1yr24plg3d4girg27ajjkf9mndig706fs8b2kmnmhi4l2xi866yh";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index 869cb06a57a5..fbf1fbce7931 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
- version = "1.0.14";
+ version = "1.0.15";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-1ByCd7PymRLm67msNu6TXSm37C9KnmEl0v/+flfqz1A=";
+ sha256 = "sha256-bR+2885JdGoVHBIZQG8iF0OXsECew7m5N9vopKtGp3I=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix
index c93c8d4207fe..291ef8fba62e 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/pkgs/development/python-modules/pylint-django/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pylint-django";
- version = "2.4.4";
+ version = "2.5.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "PyCQA";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-bFcb5GhC7jc7jEpNlyjWa2CuCSMvQLJdnag+7mHwSb8=";
+ sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index e1d7ddff298d..a4725c4781c6 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pylsp-mypy";
- version = "0.5.1";
+ version = "0.5.7";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Richardk2n";
repo = "pylsp-mypy";
rev = version;
- sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr";
+ sha256 = "0am16z9kmj57r5pi32jhzlbdngzmvzzaiqjm7cba1izh7w5m6dvc";
};
disabledTests = [
diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index 5354efacb4dc..be13f77490ad 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,4 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchFromGitHub
+, cython
, enum34
, glibcLocales
, matplotlib
@@ -8,6 +9,7 @@
, palettable
, pandas
, plotly
+, pybtex
, pydispatcher
, requests
, ruamel-yaml
@@ -21,14 +23,20 @@
buildPythonPackage rec {
pname = "pymatgen";
- version = "2022.0.17";
+ version = "2022.2.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7103b89b889bb940709eea53226d3c9298584ad9ab42ab8c8f9de3872d7d969b";
+ # sdist doesn't include c files
+ src = fetchFromGitHub {
+ owner = "materialsproject";
+ repo = "pymatgen";
+ rev= "v${version}";
+ sha256 = "sha256-92Dxmo1Z9LR2caSOftIf1I6jeZmqDe3SqhhoCofWraw=";
};
- nativeBuildInputs = [ glibcLocales ];
+ nativeBuildInputs = [
+ cython
+ glibcLocales
+ ];
propagatedBuildInputs = [
enum34
@@ -39,6 +47,7 @@ buildPythonPackage rec {
palettable
pandas
plotly
+ pybtex
pydispatcher
requests
ruamel-yaml
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index f7555d48ebb6..42c369dbf7e7 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pymupdf";
- version = "1.19.2";
+ version = "1.19.4";
src = fetchPypi {
pname = "PyMuPDF";
inherit version;
- sha256 = "964bbacddab9cba6cd2c8f388429fe4a97c0775b3096a13ac15724f5a1a2c58d";
+ sha256 = "125783986da87fe1a5372d621e90fa49e454454af0b3d0f894858c146c712f81";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix
index 9506e1504836..d071743d748d 100644
--- a/pkgs/development/python-modules/pymysensors/default.nix
+++ b/pkgs/development/python-modules/pymysensors/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pymysensors";
- version = "0.22.1";
+ version = "0.23.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "theolind";
repo = pname;
rev = version;
- sha256 = "sha256-n4khOQspJBeq0w+epdXYZh6I1lI1drB1JewZ6GfzVHs=";
+ sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index 91a197e7cf66..f34956d7280f 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
@@ -6,19 +7,19 @@
, libsodium
, cffi
, hypothesis
-, stdenv
-, six
}:
buildPythonPackage rec {
pname = "pynacl";
- version = "1.4.0";
+ version = "1.5.0";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "PyNaCl";
- sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal";
+ sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba";
};
buildInputs = [
@@ -31,7 +32,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cffi
- six
];
checkInputs = [
@@ -41,11 +41,14 @@ buildPythonPackage rec {
SODIUM_INSTALL = "system";
- pythonImportsCheck = [ "nacl" ];
+ pythonImportsCheck = [
+ "nacl"
+ ];
meta = with lib; {
description = "Python binding to the Networking and Cryptography (NaCl) library";
homepage = "https://github.com/pyca/pynacl/";
license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index 46bc5d49cae1..d3b39457438c 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pynamodb";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60";
+ sha256 = "sha256-x6nFV7UjZLwJJX7dADeO68dSWLvaoP4FD8ziNWFJ+Qo=";
};
propagatedBuildInputs = [ python-dateutil botocore ];
diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix
index 641165cedd3f..58c7f1df15b7 100644
--- a/pkgs/development/python-modules/pynuki/default.nix
+++ b/pkgs/development/python-modules/pynuki/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, poetry-core
, requests
+, pythonOlder
}:
buildPythonPackage rec {
@@ -10,6 +11,8 @@ buildPythonPackage rec {
version = "1.5.2";
format = "pyproject";
+ disabled = pythonOlder "3.8";
+
src = fetchFromGitHub {
owner = "pschmitt";
repo = pname;
@@ -24,11 +27,16 @@ buildPythonPackage rec {
nativeBuildInputs = [ poetry-core ];
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [
+ requests
+ ];
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "pynuki" ];
+
+ pythonImportsCheck = [
+ "pynuki"
+ ];
meta = with lib; {
description = "Python bindings for nuki.io bridges";
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index d657efd707f8..8ba6acb19f60 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -2,18 +2,19 @@
, stdenv
, fetchPypi
, buildPythonPackage
-, Mako
-, pytest
-, numpy
-, cffi
-, pytools
-, decorator
, appdirs
-, six
-, opencl-headers
-, ocl-icd
-, pybind11
+, cffi
+, decorator
+, Mako
, mesa_drivers
+, numpy
+, ocl-icd
+, opencl-headers
+, platformdirs
+, pybind11
+, pytest
+, pytools
+, six
}:
let
@@ -21,16 +22,25 @@ let
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
in buildPythonPackage rec {
pname = "pyopencl";
- version = "2021.2.10";
+ version = "2021.2.11";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
- propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];
+ propagatedBuildInputs = [
+ appdirs
+ cffi
+ decorator
+ Mako
+ numpy
+ platformdirs
+ pytools
+ six
+ ];
src = fetchPypi {
inherit pname version;
- sha256 = "75a1f202741bace9606a8680bbbfac69bf8a73d4e7511fb1a6ce3e48185996ae";
+ sha256 = "334a6cdde7ef18e4370604b9a1d6551b055e8828a4da004893f26091669b561b";
};
# py.test is not needed during runtime, so remove it from `install_requires`
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 688731033a98..16bfddc8340a 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -47,6 +47,8 @@ let
"test_fallback_default_verify_paths"
# https://github.com/pyca/pyopenssl/issues/768
"test_wantWriteError"
+ # https://github.com/pyca/pyopenssl/issues/1043
+ "test_alpn_call_failure"
] ++ (
lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests
) ++ (
@@ -64,12 +66,12 @@ in
buildPythonPackage rec {
pname = "pyopenssl";
- version = "20.0.1";
+ version = "21.0.0";
src = fetchPypi {
pname = "pyOpenSSL";
inherit version;
- sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51";
+ sha256 = "5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix
index 5ecfdfb88839..27047cf6eabc 100644
--- a/pkgs/development/python-modules/pyparsing/default.nix
+++ b/pkgs/development/python-modules/pyparsing/default.nix
@@ -2,34 +2,47 @@
, fetchFromGitHub
, lib
-# pythonPackages
-, coverage
+# since this is a dependency of pytest, we need to avoid
+# circular dependencies
+, jinja2
+, railroad-diagrams
}:
-buildPythonPackage rec {
- pname = "pyparsing";
- version = "2.4.7";
+let
+ pyparsing = buildPythonPackage rec {
+ pname = "pyparsing";
+ version = "3.0.6";
- src = fetchFromGitHub {
- owner = "pyparsing";
- repo = pname;
- rev = "pyparsing_${version}";
- sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h";
- };
+ src = fetchFromGitHub {
+ owner = "pyparsing";
+ repo = pname;
+ rev = "pyparsing_${version}";
+ sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a";
+ };
- # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6
- checkInputs = [ coverage ];
- checkPhase = ''
- coverage run --branch simple_unit_tests.py
- coverage run --branch unitTests.py
- '';
-
- meta = with lib; {
- homepage = "https://github.com/pyparsing/pyparsing";
- description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
- license = licenses.mit;
- maintainers = with maintainers; [
- kamadorueda
+ # circular dependencies if enabled by default
+ doCheck = false;
+ checkInputs = [
+ jinja2
+ railroad-diagrams
];
+
+ checkPhase = ''
+ python -m unittest
+ '';
+
+ passthru.tests = {
+ check = pyparsing.overridePythonAttrs (_: { doCheck = true; });
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/pyparsing/pyparsing";
+ description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ kamadorueda
+ ];
+ };
};
-}
+in
+ pyparsing
diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index 76146f3c15d3..ae297389bb15 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -1,16 +1,18 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytest-timeout
, pytestCheckHook
, pythonOlder
-, stdenv
}:
buildPythonPackage rec {
pname = "pypck";
version = "0.7.13";
+ format = "setuptools";
+
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
@@ -32,7 +34,9 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
- pythonImportsCheck = [ "pypck" ];
+ pythonImportsCheck = [
+ "pypck"
+ ];
meta = with lib; {
description = "LCN-PCK library written in Python";
diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix
index 74581ba7e33c..7bb46b115e00 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/pkgs/development/python-modules/pyphen/default.nix
@@ -1,18 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
+, flit
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyphen";
- version = "0.11.0";
+ version = "0.12.0";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8";
+ sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b";
};
+ nativeBuildInputs = [
+ flit
+ ];
+
preCheck = ''
sed -i '/addopts/d' pyproject.toml
'';
diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix
new file mode 100644
index 000000000000..e88891172deb
--- /dev/null
+++ b/pkgs/development/python-modules/pypytools/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchpatch
+, fetchPypi
+, freezegun
+, numpy
+, py
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pypytools";
+ version = "0.6.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-oUDAU+TRwLroNfQGYusAQKdRkHcazysqiDLfp77v5Sk=";
+ };
+
+ propagatedBuildInputs = [
+ py
+ ];
+
+ checkInputs = [
+ freezegun
+ numpy
+ pytestCheckHook
+ ];
+
+ patches = [
+ # Support for later Python releases, https://github.com/antocuni/pypytools/pull/2
+ (fetchpatch {
+ name = "support-later-python.patch";
+ url = "https://github.com/antocuni/pypytools/commit/c6aed496ec35a6ef7ce9e95084849eebc16bafef.patch";
+ sha256 = "sha256-YoYRZmgueQmxRtGaeP4zEVxuA0U7TB0PmoYHHVI7ICQ=";
+ })
+ ];
+
+ pythonImportsCheck = [
+ "pypytools"
+ ];
+
+ meta = with lib; {
+ description = "Collection of tools to use PyPy-specific features";
+ homepage = "https://github.com/antocuni/pypytools";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix
index f984bcc2dea6..38dd2a8c5a30 100644
--- a/pkgs/development/python-modules/pyquil/default.nix
+++ b/pkgs/development/python-modules/pyquil/default.nix
@@ -4,7 +4,7 @@
, fetchpatch
, importlib-metadata
, ipython
-, lark-parser
+, lark
, networkx
, numpy
, poetry-core
@@ -48,7 +48,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
- lark-parser
+ lark
networkx
numpy
qcs-api-client
@@ -71,7 +71,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"'
+ --replace 'lark = "^0.11.1"' 'lark = "*"'
'';
disabledTestPaths = [
@@ -92,6 +92,9 @@ buildPythonPackage rec {
disabledTests = [
"test_compile_with_quilt_calibrations"
"test_sets_timeout_on_requests"
+ # sensitive to lark parser output
+ "test_memory_commands"
+ "test_classical"
];
pythonImportsCheck = [ "pyquil" ];
diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix
index 6b63ac8f9fe2..7e1fb8876cb0 100644
--- a/pkgs/development/python-modules/pyrfxtrx/default.nix
+++ b/pkgs/development/python-modules/pyrfxtrx/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyrfxtrx";
- version = "0.27.0";
+ version = "0.27.1";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyRFXtrx";
rev = version;
- sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm";
+ hash = "sha256-JBU/ApBumdW87fQqMAopzv+UV0f6VsHMiyNqG7BRLgo=";
};
propagatedBuildInputs = [
@@ -24,6 +24,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTestPaths = [
+ # https://github.com/Danielhiversen/pyRFXtrx/issues/130
+ "tests/test_rollertrol.py"
+ ];
+
meta = with lib; {
description = "Library to communicate with the RFXtrx family of devices";
homepage = "https://github.com/Danielhiversen/pyRFXtrx";
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index 982b83eb52b0..dc453e86c702 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyrogram";
- version = "1.3.7";
+ version = "1.4.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "Pyrogram";
inherit version;
- hash = "sha256-OwjlZIuwbrmaCe/2lz+flr8sAyJZYXixjhtPylgExKQ=";
+ hash = "sha256-5twH9ZfwtP6gi50K8nqXOmCPSFkHO5Hitd7XaDP0EQg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix
index 85fc18463690..00281735067a 100644
--- a/pkgs/development/python-modules/pyskyqremote/default.nix
+++ b/pkgs/development/python-modules/pyskyqremote/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyskyqremote";
- version = "0.2.54";
+ version = "0.2.59";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_remote";
rev = version;
- sha256 = "sha256-Z3fcihyK8QHtdREXWt2ESqjwAwxFZFEI9OXf3Y9onmw=";
+ sha256 = "sha256-I4BgNb+ijp6yVxHfccQMHY0Haf6tcWjsPNPWhEO6Puc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix
index bfbec757b1d7..95e22510d8a0 100644
--- a/pkgs/development/python-modules/pytest-arraydiff/default.nix
+++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix
@@ -2,35 +2,48 @@
, buildPythonPackage
, fetchPypi
, numpy
-, six
, pytest
+, pythonOlder
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "pytest-arraydiff";
- version = "0.3";
+ version = "0.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15";
+ sha256 = "714149beffd0dfa085477c65791c1139b619602b049536353ce1a91397fb3bd2";
};
- buildInputs = [ pytest ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ buildInputs = [
+ pytest
+ ];
propagatedBuildInputs = [
numpy
- six
];
- # The tests requires astropy, which itself requires
- # pytest-arraydiff. This causes an infinite recursion if the tests
- # are enabled.
+ # The tests requires astropy, which itself requires pytest-arraydiff
doCheck = false;
+ pythonImportsCheck = [
+ "pytest_arraydiff"
+ ];
+
meta = with lib; {
description = "Pytest plugin to help with comparing array output from tests";
homepage = "https://github.com/astrofrog/pytest-arraydiff";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 4059a3c12fbe..6401e1ce2c9b 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,15 +1,17 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, flaky
, hypothesis
, pytest
, pytestCheckHook
, pythonOlder
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "pytest-asyncio";
- version = "0.16.0";
+ version = "0.17.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -18,14 +20,21 @@ buildPythonPackage rec {
owner = "pytest-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4zMbzdDtiLRKo5C12wZRoBNguXLn3f26NuDwQ+pHA0I=";
+ sha256 = "sha256-4wDXvO6pDK0dQLnyfJTTa+GXf9Qtsi6ywYDUIdhkgGo=";
};
- buildInputs = [
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
pytest
];
checkInputs = [
+ flaky
hypothesis
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix
index b087cd6f4598..6ca95bca4c0b 100644
--- a/pkgs/development/python-modules/pytest-bdd/default.nix
+++ b/pkgs/development/python-modules/pytest-bdd/default.nix
@@ -1,4 +1,6 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
, execnet
, glob2
, Mako
@@ -8,41 +10,51 @@
, py
, pytest
, pytestCheckHook
-, six
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pytest-bdd";
- version = "4.0.2";
+ version = "5.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
- # tests are not included in pypi tarball
src = fetchFromGitHub {
owner = "pytest-dev";
repo = pname;
rev = version;
- sha256 = "0pxx4c8lm68rw0jshbr09fnadg8zz8j73q0qi49yw9s7yw86bg5l";
+ sha256 = "sha256-3P9ongMAsLITOCRPmME492xnkdVc8IdOVrINK57gfOY=";
};
- patches = [
- # Fixed compatibility with pytest > 6.1
- (fetchpatch {
- url = "https://github.com/pytest-dev/pytest-bdd/commit/e1dc0cad9a1c1ba563ccfbc24f9993d83ac59293.patch";
- sha256 = "1p3gavh6nir2a8crd5wdf0prfrg0hmgar9slvn8a21ils3k5pm5y";
- })
+ buildInputs = [
+ pytest
];
+ propagatedBuildInputs = [
+ glob2
+ Mako
+ parse
+ parse-type
+ py
+ ];
- buildInputs = [ pytest ];
+ checkInputs = [
+ pytestCheckHook
+ execnet
+ mock
+ ];
- propagatedBuildInputs = [ glob2 Mako parse parse-type py six ];
-
- checkInputs = [ pytestCheckHook execnet mock ];
preCheck = ''
export PATH=$PATH:$out/bin
'';
+ pythonImportsCheck = [
+ "pytest_bdd"
+ ];
+
meta = with lib; {
- description = "BDD library for the py.test runner";
+ description = "BDD library for the pytest";
homepage = "https://github.com/pytest-dev/pytest-bdd";
license = licenses.mit;
maintainers = with maintainers; [ jm2dev ];
diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index 87f5972a747d..971b12dc01c7 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -4,20 +4,21 @@
, pytest
, coverage
, toml
+, tomli
}:
buildPythonPackage rec {
pname = "pytest-cov";
- version = "2.12.1";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1mzl06m8qcgsac1r2krixrkqdwq0nqk8asrpkcj2ddr7qawfw716";
+ sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470";
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ coverage toml ];
+ propagatedBuildInputs = [ coverage toml tomli ];
# xdist related tests fail with the following error
# OSError: [Errno 13] Permission denied: 'py/_code'
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index d3b2bc66aae4..c4668def279e 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -10,11 +10,11 @@
}:
buildPythonPackage rec {
pname = "pytest-django";
- version = "4.5.1";
+ version = "4.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "01fe1242e706375d7c942d206a30826bd9c0dffde99bfac627050cdc91f0d792";
+ sha256 = "d9076f759bb7c36939dbdd5ae6633c18edfc2902d1a69fdbefd2426b970ce6c2";
};
nativeBuildInputs = [ pytest setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 836da1e157ff..0069eb6f179e 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -1,35 +1,46 @@
-{ buildPythonPackage
-, lib
-, fetchPypi
-, pytest
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
, httpbin
+, pytest
+, pytestCheckHook
+, requests
, six
}:
buildPythonPackage rec {
pname = "pytest-httpbin";
- version = "1.0.0";
+ version = "1.0.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq";
+ src = fetchFromGitHub {
+ owner = "kevin1024";
+ repo = "pytest-httpbin";
+ rev = "v${version}";
+ hash = "sha256-Vngd8Vum96+rdG8Nz1+aHrO6WZjiAz+0CeIovaH8N+s=";
};
- checkInputs = [ pytest ];
+ buildInputs = [
+ pytest
+ ];
- propagatedBuildInputs = [ httpbin six ];
+ propagatedBuildInputs = [
+ httpbin
+ six
+ ];
- checkPhase = ''
- py.test
- '';
+ checkInputs = [
+ pytestCheckHook
+ requests
+ ];
- # https://github.com/kevin1024/pytest-httpbin/pull/51
- doCheck = false;
+ pythonImportsCheck = [
+ "pytest_httpbin"
+ ];
- meta = {
- description = "Easily test your HTTP library against a local copy of httpbin.org";
+ meta = with lib; {
+ description = "Test your HTTP library against a local copy of httpbin.org";
homepage = "https://github.com/kevin1024/pytest-httpbin";
- license = lib.licenses.mit;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
-
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
index e5008af9ef2f..e3823c18d895 100644
--- a/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pytest-localserver";
- version = "0.5.1";
+ version = "0.5.1.post0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761";
+ sha256 = "5ec7f8e6534cf03887af2cb59e577f169ac0e8b2fd2c3e3409280035f386d407";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index a8127e276f45..7f07ed2b6dd1 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ # output of pytest has changed
+ "test_used_with_"
+ "test_plain_stopall"
+ ];
+
pythonImportsCheck = [ "pytest_mock" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
index 38b2168e13fd..806c12c0e4ff 100644
--- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
+++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix
@@ -1,27 +1,57 @@
{ lib
, buildPythonPackage
-, fetchFromGitHub
, chevron
-, pyyaml
+, decorator
+, fetchFromGitHub
, mypy
, pytest
-, decorator
+, pytestCheckHook
+, pythonOlder
+, pyyaml
, regex
}:
buildPythonPackage rec {
pname = "pytest-mypy-plugins";
- version = "1.9.2";
+ version = "1.9.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = "typeddjango";
repo = pname;
rev = version;
- sha256 = "sha256-Me5P4Q2M+gGEWlUVgQ0L048rVUOlUzVMgZZcqZPeE4Q=";
+ sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg=";
};
- propagatedBuildInputs = [ chevron pyyaml mypy pytest decorator regex ];
+
+ buildInputs = [
+ pytest
+ ];
+
+ propagatedBuildInputs = [
+ chevron
+ pyyaml
+ mypy
+ decorator
+ regex
+ ];
+
+ checkInputs = [
+ mypy
+ pytestCheckHook
+ ];
+
+ preCheck = ''
+ export PATH="$PATH:$out/bin";
+ '';
+
+ pythonImportsCheck = [
+ "pytest_mypy_plugins"
+ ];
meta = with lib; {
- description = "pytest plugin for testing mypy types, stubs, and plugins";
+ description = "Pytest plugin for testing mypy types, stubs, and plugins";
homepage = "https://github.com/TypedDjango/pytest-mypy-plugins";
license = licenses.mit;
maintainers = with maintainers; [ SomeoneSerge ];
diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix
index a2fe0c6f25c4..5aae59bc605f 100644
--- a/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -12,16 +12,16 @@
buildPythonPackage rec {
pname = "pytest-randomly";
- version = "3.10.3";
+ version = "3.11.0";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
repo = pname;
owner = "pytest-dev";
rev = version;
- sha256 = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc=";
+ hash = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
@@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Pytest plugin to randomly order tests and control random.seed";
homepage = "https://github.com/pytest-dev/pytest-randomly";
- license = licenses.bsd3;
+ license = licenses.mit;
maintainers = with maintainers; [ sternenseemann ];
};
}
diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 90b72c886eac..6866df7b7125 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
-, fetchpatch
, fetchPypi
, pythonOlder
, matplotlib
@@ -16,33 +15,44 @@
buildPythonPackage rec {
pname = "pytest-regressions";
- version = "2.2.0";
+ version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716";
+ sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4=";
};
- patches = [
- # Make pytest-regressions compatible with NumPy 1.20.
- # Should be part of the next release.
- (fetchpatch {
- url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch";
- sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0=";
- })
- ];
-
- nativeBuildInputs = [ setuptools-scm ];
- buildInputs = [ pytest ];
- propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ];
-
SETUPTOOLS_SCM_PRETEND_VERSION = version;
- checkInputs = [ pytestCheckHook matplotlib ];
- pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ buildInputs = [
+ pytest
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ pandas
+ pillow
+ pytest-datadir
+ pyyaml
+ ];
+
+
+ checkInputs = [
+ pytestCheckHook
+ matplotlib
+ ];
+
+ pythonImportsCheck = [
+ "pytest_regressions"
+ "pytest_regressions.plugin"
+ ];
meta = with lib; {
description = "Pytest fixtures to write regression tests";
diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix
index fb91f461329e..fc9b5e6f9c1b 100644
--- a/pkgs/development/python-modules/pytest-remotedata/default.nix
+++ b/pkgs/development/python-modules/pytest-remotedata/default.nix
@@ -1,38 +1,54 @@
{ lib
, buildPythonPackage
, fetchPypi
-, six
, pytest
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+, six
}:
buildPythonPackage rec {
pname = "pytest-remotedata";
- version = "0.3.2";
+ version = "0.3.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0";
+ sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3";
};
- buildInputs = [ pytest ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ buildInputs = [
+ pytest
+ ];
propagatedBuildInputs = [
six
];
checkInputs = [
- pytest
+ pytestCheckHook
];
- checkPhase = ''
- # these tests require a network connection
- pytest --ignore tests/test_strict_check.py
- '';
+ disabledTestPaths = [
+ # These tests require a network connection
+ "tests/test_strict_check.py"
+ ];
+
+ pythonImportsCheck = [
+ "pytest_remotedata"
+ ];
meta = with lib; {
description = "Pytest plugin for controlling remote data access";
- homepage = "https://astropy.org";
+ homepage = "https://github.com/astropy/pytest-remotedata";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix
index f095cbb99734..cc890096f796 100644
--- a/pkgs/development/python-modules/pytest-subprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-subprocess/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytest-subprocess";
- version = "1.4.0";
+ version = "1.4.1";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "aklajnert";
repo = "pytest-subprocess";
rev = version;
- hash = "sha256-+bsxoOsY0yf77EivImrfqxgVW0T/VnFIJXvy8X5pmEY=";
+ hash = "sha256-xNkOXBCQ4AH/JVmxFzI3VSouA6jkCbUom7AdckfjGiE=";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix
index 6b556abeaa4f..d5e379b524d5 100644
--- a/pkgs/development/python-modules/pytest-subtests/default.nix
+++ b/pkgs/development/python-modules/pytest-subtests/default.nix
@@ -8,22 +8,30 @@
buildPythonPackage rec {
pname = "pytest-subtests";
- version = "0.5.0";
- disabled = pythonOlder "3.5";
+ version = "0.6.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120";
+ sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo=";
};
- nativeBuildInputs = [ setuptools-scm ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- pythonImportsCheck = [ "pytest_subtests" ];
+ pythonImportsCheck = [
+ "pytest_subtests"
+ ];
meta = with lib; {
- description = "pytest plugin for unittest subTest() support and subtests fixture";
+ description = "Pytest plugin for unittest subTest() support and subtests fixture";
homepage = "https://github.com/pytest-dev/pytest-subtests";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index f504bd80868b..f99340e48b3b 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pytest-timeout";
- version = "2.0.1";
+ version = "2.0.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-pexOzt246nJpEYSFk9ZoWUEH55diHpf5Oh0dvG+7kIA=";
+ sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix
index d643603a0679..60e6f2e74552 100644
--- a/pkgs/development/python-modules/python-dbusmock/default.nix
+++ b/pkgs/development/python-modules/python-dbusmock/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "python-dbusmock";
- version = "0.19";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "martinpitt";
repo = pname;
rev = version;
- sha256 = "09j338lmrjabbd3fpajr4piz4r20sl33030szfsqfzlwrrmvkyi0";
+ sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9";
};
prePatch = ''
@@ -38,6 +38,10 @@ buildPythonPackage rec {
"test_cli"
"test_timedated"
"test_upower"
+ # needs glib
+ "test_accounts_service"
+ # needs dbus-daemon active
+ "test_systemd"
# Very slow, consider disabling?
# "test_networkmanager"
];
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 8e446d6b9909..05efc97b6448 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -2,12 +2,15 @@
, buildPythonPackage
, fetchPypi
, ddt
+, installShellFiles
+, openstackdocstheme
, osc-lib
, pbr
, python-cinderclient
, python-keystoneclient
, python-novaclient
, requests-mock
+, sphinx
, stestr
}:
@@ -20,6 +23,12 @@ buildPythonPackage rec {
sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92";
};
+ nativeBuildInputs = [
+ installShellFiles
+ openstackdocstheme
+ sphinx
+ ];
+
propagatedBuildInputs = [
osc-lib
pbr
@@ -28,6 +37,11 @@ buildPythonPackage rec {
python-novaclient
];
+ postInstall = ''
+ sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man
+ installManPage doc/build/man/openstack.1
+ '';
+
checkInputs = [
ddt
stestr
diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix
index b494d2e442e6..0d34262ea3bb 100644
--- a/pkgs/development/python-modules/python-snap7/default.nix
+++ b/pkgs/development/python-modules/python-snap7/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "python-snap7";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "gijzelaerr";
repo = "python-snap7";
rev = version;
- sha256 = "103drdwf4v3yqvd7sscxx154mmmshb6x19v9yqmkj2lj76m0619s";
+ sha256 = "18z13wb2q5q3msp9w3wddg1byp7picczw4ng8w1ccj4npidxsqv8";
};
propagatedBuildInputs = [ setuptools six ];
diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index e6c2d016bb09..e11f5ff1eb53 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "python-socks";
- version = "2.0.0";
+ version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.6.1";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "romis2012";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iTwlUyfTD2ZhOvBX3IDqjkeW4Z2tfKxvQjIV7GGBVJA=";
+ sha256 = "1ixhi23x28bg45146p23z26y38rlz445xr0inwgx7avh0rs7vwfx";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index d79f357e50e1..3a47e107df6e 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -3,17 +3,19 @@
, fetchFromGitHub
, pytestCheckHook
, six
+, pytest-mypy
}:
buildPythonPackage rec {
pname = "python-utils";
- version = "2.7.0";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "WoLpH";
repo = pname;
rev = "v${version}";
- sha256 = "0gns9v5144cj03p7qbb3822scb6pwrlgr6niixpkynwqkcwjfg4c";
+ sha256 = "sha256-+NgcVIDM9f2OKBpJNWlSyFxEONltPWJSWIu400/5RkQ=
+";
};
# disable coverage and linting
@@ -27,6 +29,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ pytest-mypy
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix
index 9039c52a8a42..8a9433ec898f 100644
--- a/pkgs/development/python-modules/pythonocc-core/default.nix
+++ b/pkgs/development/python-modules/pythonocc-core/default.nix
@@ -1,15 +1,29 @@
-{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade, smesh, freetype, libGL, libGLU, libX11
-, Cocoa }:
+{ lib, stdenv, python, fetchFromGitHub
+, cmake
+, Cocoa
+, fontconfig
+, freetype
+, libGL
+, libGLU
+, libX11
+, libXext
+, libXi
+, libXmu
+, opencascade-occt
+, rapidjson
+, smesh
+, swig
+}:
stdenv.mkDerivation rec {
pname = "pythonocc-core";
- version = "0.18.1";
+ version = "7.5.1";
src = fetchFromGitHub {
owner = "tpaviot";
repo = "pythonocc-core";
rev = version;
- sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3";
+ sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s";
};
postPatch = ''
@@ -20,8 +34,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake swig ];
buildInputs = [
- python opencascade smesh
- freetype libGL libGLU libX11
+ python opencascade-occt smesh
+ freetype libGL libGLU libX11 libXext libXmu libXi
+ fontconfig rapidjson
] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
cmakeFlags = [
diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
index 63991752a8ac..de75aa0ae8fb 100644
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pytorch-lightning";
- version = "0.8.5";
+ version = "1.5.8";
disabled = isPy27;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "PyTorchLightning";
repo = pname;
rev = version;
- sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a";
+ sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index 0c1ca751eb13..e9728b3d676c 100644
--- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pytorch-metric-learning";
- version = "0.9.99";
+ version = "1.1.0";
disabled = isPy27;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "KevinMusgrave";
repo = pname;
rev = "v${version}";
- sha256 = "1ahs2b7q3hxi6yv4g2fjy7mvl899h56dvlpc2r9301440qsgkdzr";
+ sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 564087769acd..c370eaf6a942 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -117,7 +117,7 @@ let
in buildPythonPackage rec {
pname = "pytorch";
# Don't forget to update pytorch-bin to the same version.
- version = "1.9.0";
+ version = "1.10.2";
disabled = !isPy3k;
@@ -132,7 +132,7 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-gZmEhV1zzfr/5T2uNfS+8knzyJIxnv2COWVyiAzU9jM=";
+ sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU=";
};
patches = lib.optionals stdenv.isDarwin [
@@ -304,7 +304,7 @@ in buildPythonPackage rec {
passthru = {
inherit cudaSupport;
cudaArchList = final_cudaArchList;
- # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
+ # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability.
blasProvider = blas.provider;
};
diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix
index 1a78aefa6daf..10e07f4e22ab 100644
--- a/pkgs/development/python-modules/pyvlx/default.nix
+++ b/pkgs/development/python-modules/pyvlx/default.nix
@@ -2,25 +2,35 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
+, pythonOlder
, pyyaml
}:
buildPythonPackage rec {
pname = "pyvlx";
- version = "0.2.19";
+ version = "0.2.20";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Julius2342";
repo = pname;
rev = version;
- sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf";
+ sha256 = "1irjix9kr6qih84gii7k1a9c67n8133gpnmwfd09550jsqdmg006";
};
- propagatedBuildInputs = [ pyyaml ];
+ propagatedBuildInputs = [
+ pyyaml
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- pythonImportsCheck = [ "pyvlx" ];
+ pythonImportsCheck = [
+ "pyvlx"
+ ];
meta = with lib; {
description = "Python client to work with Velux units";
diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix
index 1e2f8db96cd8..15545acf2f63 100644
--- a/pkgs/development/python-modules/pywemo/default.nix
+++ b/pkgs/development/python-modules/pywemo/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pywemo";
- version = "0.7.0";
+ version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-NwhKrk5cQT7kk4VCr0BMQz0yTP/vuBA6MjTRuk2LM5Y=";
+ hash = "sha256-bGoqhrjoRKUGPBNfmr2XP+1HL5mdRi6XoCi0BdvY9x8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 94b89bcb3795..919b2a7574a7 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pywizlight";
- version = "0.5.3";
+ version = "0.5.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "sbidy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-CbbnCNHmc2yoKX8hDUCD8gIvDX5HNL3HYKpbJjLgQwk=";
+ sha256 = "sha256-1iu+Ztwwm97fyBWyYkFiATxjJYVLiW1y0QmSO2LzjMo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix
index 6b9b94b603f4..6e3b6064fcb7 100644
--- a/pkgs/development/python-modules/qdarkstyle/default.nix
+++ b/pkgs/development/python-modules/qdarkstyle/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "qdarkstyle";
- version = "2.8.1";
+ version = "3.0.3";
src = fetchPypi {
inherit version;
pname = "QDarkStyle";
- sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym";
+ sha256 = "936d2d35b552f429803a985dbc17fc879a2f966faa9fbf8983896ccfa33e68f6";
};
# No tests available
diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix
index 3576f5b73660..51c762c81075 100644
--- a/pkgs/development/python-modules/qiling/default.nix
+++ b/pkgs/development/python-modules/qiling/default.nix
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "qiling";
- version = "1.4.0";
+ version = "1.4.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-xUoNHMyGN0G2itVcKLsk+7QKxZdguzyh6OZCqCHNB4Y=";
+ sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix
index b2e708d586f7..13ffac0c2f72 100644
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "qiskit-aer";
- version = "0.9.1";
+ version = "0.10.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
- sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g=";
+ sha256 = "0icdsiwpvjwiakg94i562wpgnj1qd7l8pkcjnvfwksq4w3pd9xjg";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix
index d4eaa58e7af9..05676a60f124 100644
--- a/pkgs/development/python-modules/qiskit-finance/default.nix
+++ b/pkgs/development/python-modules/qiskit-finance/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "qiskit-finance";
- version = "0.2.1";
+ version = "0.3.0";
disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = pname;
rev = version;
- sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY=";
+ sha256 = "1wpx519apnpp25yiq20warg4q8yv09x8fk0m8b9kyp199x86iffp";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
index 5b304bf38984..0c8f74cf66dd 100644
--- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
+++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -40,7 +40,7 @@ let
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
- version = "0.18.1";
+ version = "0.18.3";
disabled = pythonOlder "3.6";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
- sha256 = "sha256-rySSCyI+62G7kL1ZRtjX1WeWj3LPXECvrlXAcIDINF4=";
+ sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix
index f7ebbee39f80..a8f45b73e490 100644
--- a/pkgs/development/python-modules/qiskit-ignis/default.nix
+++ b/pkgs/development/python-modules/qiskit-ignis/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "qiskit-ignis";
- version = "0.6.0";
+ version = "0.7.0";
disabled = pythonOlder "3.6";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-ignis";
rev = version;
- hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0=";
+ hash = "sha256-5dsRKsz/nruWKuox/WJBghp2CWSDuYvax+G5ZxjZG4s=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
index a2006079c195..511bc0b2a0be 100644
--- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix
+++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "qiskit-machine-learning";
- version = "0.2.1";
+ version = "0.3.0";
disabled = pythonOlder "3.6";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = pname;
rev = version;
- sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY=";
+ sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix
index 09941fcdd448..66f7bdbf626d 100644
--- a/pkgs/development/python-modules/qiskit-nature/default.nix
+++ b/pkgs/development/python-modules/qiskit-nature/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "qiskit-nature";
- version = "0.2.2";
+ version = "0.3.0";
disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = pname;
rev = version;
- sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY=";
+ sha256 = "1lr198l2z9j1hw389vv6mgz6djkq4bw91r0hif58jpg8w6kmzsx9";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix
index 5d9ae3d4375f..b1ce0561dc4b 100644
--- a/pkgs/development/python-modules/qiskit-optimization/default.nix
+++ b/pkgs/development/python-modules/qiskit-optimization/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "qiskit-optimization";
- version = "0.2.3";
+ version = "0.3.0";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = pname;
rev = version;
- sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img=";
+ sha256 = "18qs0m21j73fjawq3pxz5q5c0g2wgqgicy7p4a57lialpv6vrmc0";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix
index da31f86500fb..75d4ba2c0bad 100644
--- a/pkgs/development/python-modules/qiskit-terra/default.nix
+++ b/pkgs/development/python-modules/qiskit-terra/default.nix
@@ -56,7 +56,7 @@ in
buildPythonPackage rec {
pname = "qiskit-terra";
- version = "0.18.3";
+ version = "0.19.1";
disabled = pythonOlder "3.6";
@@ -64,7 +64,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
- sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs=";
+ sha256 = "16d8dghjn81v6hxfg4bpj3cl2csy2rkc279qvijnwp2i9x4y8iyq";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 9d050606006c..b6195d9bd84e 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -29,7 +29,7 @@ in
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
- version = "0.32.1";
+ version = "0.34.1";
disabled = pythonOlder "3.6";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
- sha256 = "sha256-0L4TlolvL1akHhWSJ0GRQ/Cu/rZ+Es00jjNM5Ho2uEA=";
+ sha256 = "08hfd5ny206x2d9r700wgcmqvh0vcisp4kbv6n3grdizwbvh0ny0";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index 4bcb536ad826..5c4984ca3f81 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -1,21 +1,49 @@
-{ lib, buildPythonPackage, fetchPypi, pyside, pytest }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+
+# propagates
+, packaging
+
+# tests
+, pyqt5
+, pyside
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "QtPy";
- version = "1.11.3";
+ version = "2.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d427addd37386a8d786db81864a5536700861d95bf085cb31d1bea855d699557";
+ sha256 = "777e333df4d711b2ec9743117ab319dadfbd743a5a0eee35923855ca3d35cd9d";
};
- # no concrete propagatedBuildInputs as multiple backends are supposed
- checkInputs = [ pyside pytest ];
+ propagatedBuildInputs = [
+ packaging
+ ];
- doCheck = false; # require X
- checkPhase = ''
- py.test qtpy/tests
- '';
+ doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity'
+ checkInputs = [
+ pyside
+ (pyqt5.override {
+ withConnectivity = true;
+ withMultimedia = true;
+ withWebKit = true;
+ withWebSockets = true;
+ })
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [
+ # Fatal error in python on x86_64
+ "qtpy/tests/test_uic.py"
+ ];
meta = with lib; {
description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide";
diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index 28e08eade43d..48cc70d5f2af 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "quantities";
- version = "0.12.5";
+ version = "0.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0";
+ sha256 = "0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index 38cf79e19049..8d19e360ca4d 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "qutip";
- version = "4.6.2";
+ version = "4.6.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "04g7ixq1yrrid4lliqbcamnzyw5r0fjbl8ipklps234hvsjfwmxb";
+ sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk=";
};
# QuTiP says it needs specific (old) Numpy versions. We overwrite them here
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index ac01b853c873..f75e5cc19ee5 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -6,7 +6,7 @@
, fetchFromGitHub
, freezegun
, humanize
-, lark-parser
+, lark
, parse-type
, pysingleton
, pytestCheckHook
@@ -29,7 +29,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- lark-parser
+ lark
click
colorful
tag-expressions
diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix
new file mode 100644
index 000000000000..57c07e0dc48b
--- /dev/null
+++ b/pkgs/development/python-modules/railroad-diagrams/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "railroad-diagrams";
+ version = "1.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976";
+ };
+
+ # this is a dependency of pyparsing, which is a dependency of pytest
+ doCheck = false;
+
+ pythonImportsCheck = [ "railroad" ];
+
+ meta = with lib; {
+ description = "Generate SVG railroad syntax diagrams, like on JSON.org";
+ homepage = "https://github.com/tabatkins/railroad-diagrams";
+ license = licenses.cc0;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 2ffe190a4720..73f170b90b1b 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, html5lib
, isodate
, networkx
@@ -16,14 +16,16 @@
buildPythonPackage rec {
pname = "rdflib";
- version = "6.0.2";
+ version = "6.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4=";
+ src = fetchFromGitHub {
+ owner = "RDFLib";
+ repo = pname;
+ rev = version;
+ hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd";
};
propagatedBuildInputs = [
@@ -41,6 +43,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pytestFlagsArray = [
+ # requires network access
+ "--deselect rdflib/__init__.py::rdflib"
+ "--deselect test/jsonld/test_onedotone.py::test_suite"
+ ];
+
disabledTests = [
# Requires network access
"api_key"
diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix
index c83a2bba1cd6..81c489bd8c09 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/pkgs/development/python-modules/readchar/default.nix
@@ -1,19 +1,41 @@
-{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# native
+, flake8
+
+# tests
+, pytestCheckHook
+, pexpect
+}:
buildPythonPackage rec {
pname = "readchar";
- version = "2.0.0";
+ version = "3.0.5";
+ format = "setuptools";
# Don't use wheels on PyPI
src = fetchFromGitHub {
owner = "magmax";
repo = "python-${pname}";
- rev = version;
- sha256 = "0j1vj4f2j8x5f40rs6h8qplklcxcdbvkkvjpkpmr1xagw05i12bm";
+ rev = "v${version}";
+ sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx";
};
- nativeBuildInputs = [ flake8 ];
- checkInputs = [ pytest pytest-cov pexpect ];
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "--cov readchar" ""
+ '';
+
+ nativeBuildInputs = [
+ flake8
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pexpect
+ ];
meta = with lib; {
homepage = "https://github.com/magmax/python-readchar";
diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index f64faaf82ca7..65ab0cb2682a 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -40,6 +40,11 @@ buildPythonPackage rec {
--replace "cmarkgfm>=0.5.0,<0.7.0" "cmarkgfm>=0.5.0,<1"
'';
+ disabledTests = [
+ # https://github.com/pypa/readme_renderer/issues/221
+ "test_GFM_"
+ ];
+
pythonImportsCheck = [
"readme_renderer"
];
diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix
index fc888c2379ee..99c868eb0b80 100644
--- a/pkgs/development/python-modules/remarshal/default.nix
+++ b/pkgs/development/python-modules/remarshal/default.nix
@@ -31,7 +31,8 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace "poetry.masonry.api" "poetry.core.masonry.api" \
- --replace 'PyYAML = "^5.3"' 'PyYAML = "*"'
+ --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \
+ --replace 'tomlkit = "^0.7"' 'tomlkit = "*"'
'';
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix
index 71f94d489aa1..69a1b11fea4c 100644
--- a/pkgs/development/python-modules/reolink/default.nix
+++ b/pkgs/development/python-modules/reolink/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink";
- version = "0.56";
+ version = "0053";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fwestenberg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ld1KDWweaG7y7EPN6Y19PzQRGCIFAPEb6AmlXXbjgCU=";
+ sha256 = "0qjp7n2qa9n9fdhfcgfgw89hy19z5144cxhkhmhv1xnfdiz175qd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 9fac4f0c2410..82d84dc26a97 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.6.3";
+ version = "3.6.5";
src = fetchPypi {
inherit pname version;
- sha256 = "be4f05230eb17b9c9c61a180ab0c89c30112da2823c77807a2a5ddba19365865";
+ sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a";
};
checkInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index f095cf00a28c..adaf824d3d92 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "requests-cache";
- version = "0.9.0";
+ version = "0.9.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -29,7 +29,8 @@ buildPythonPackage rec {
owner = "reclosedev";
repo = "requests-cache";
rev = "v${version}";
- sha256 = "0gz6fyc6lgbab9k92cihrp3711r1wcp4xhs25qp176zbzgccbj43";
+ sha256 = "sha256-MZ3N0zbo745erF52D6DqOEb4OPpXFwSsemi0z6Do02c=
+";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix
index 374627a1bb9a..d8cd9d81c94d 100644
--- a/pkgs/development/python-modules/requests-file/default.nix
+++ b/pkgs/development/python-modules/requests-file/default.nix
@@ -1,22 +1,38 @@
-{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, requests, six }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pytestCheckHook
+, requests
+, six
+}:
buildPythonPackage rec {
- pname = "requests-file";
+ pname = "requests-file";
version = "1.5.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e";
+ hash = "sha256-B9dCCNM4nQHDirie9AOvDP7GOVfVOgCB2OynONAkfY4=";
};
- propagatedBuildInputs = [ requests six ];
+ propagatedBuildInputs = [
+ requests
+ six
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
- homepage = "https://github.com/dashea/requests-file";
+ pythonImportsCheck = [
+ "requests_file"
+ ];
+
+ meta = with lib; {
description = "Transport adapter for fetching file:// URLs with the requests python library";
- license = lib.licenses.asl20;
+ homepage = "https://github.com/dashea/requests-file";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
-
}
diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix
index 7a27055aba2a..c51e24e0ac9d 100644
--- a/pkgs/development/python-modules/requests-http-signature/default.nix
+++ b/pkgs/development/python-modules/requests-http-signature/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "requests-http-signature";
version = "0.2.0";
+ format = "setuptools";
- # .pem files for tests aren't present on PyPI
src = fetchFromGitHub {
owner = "pyauth";
repo = pname;
rev = "v${version}";
- sha256 = "1jsplqrxadjsc86f0kb6dgpblgwplxrpi0ql1a714w8pbbz4z3h7";
+ hash = "sha256-B45P/loXcRKOChSDeHOnlz+67mtmTeAMYlo21TOmV8s=";
};
propagatedBuildInputs = [
@@ -27,17 +27,21 @@ buildPythonPackage rec {
pytestCheckHook
];
- pytestFlagsArray = [ "test/test.py" ];
+ pytestFlagsArray = [
+ "test/test.py"
+ ];
disabledTests = [
# Test require network access
"test_readme_example"
];
- pythonImportsCheck = [ "requests_http_signature" ];
+ pythonImportsCheck = [
+ "requests_http_signature"
+ ];
meta = with lib; {
- description = "A Requests auth module for HTTP Signature";
+ description = "Requests authentication module for HTTP Signature";
homepage = "https://github.com/kislyuk/requests-http-signature";
license = licenses.asl20;
maintainers = with maintainers; [ mmai ];
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
index 40bbb1aa6cb1..3a1382061bd7 100644
--- a/pkgs/development/python-modules/requests-kerberos/default.nix
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -1,33 +1,29 @@
{ lib
-, fetchFromGitHub
, buildPythonPackage
, cryptography
-, requests
+, fetchFromGitHub
, pykerberos
, pyspnego
-, pytestCheckHook
, pytest-mock
-, mock
+, pytestCheckHook
+, pythonOlder
+, requests
}:
buildPythonPackage rec {
pname = "requests-kerberos";
version = "0.14.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
- # tests are not present in the PyPI version
src = fetchFromGitHub {
owner = "requests";
repo = pname;
rev = "v${version}";
- sha256 = "0s30pcnlir3j2jmf7yh065f294cf3x0x5i3ldskn8mm0a3657mv3";
+ hash = "sha256-Y9dTzFCgVmSnbnTE0kEfjpEkXDEA+uOqFHLkSC27YGg=";
};
- # avoid needing to package krb5
- postPatch = ''
- substituteInPlace setup.py \
- --replace "pyspnego[kerberos]" "pyspnego"
- '';
-
propagatedBuildInputs = [
cryptography
requests
@@ -36,12 +32,19 @@ buildPythonPackage rec {
];
checkInputs = [
- mock
pytestCheckHook
pytest-mock
];
- pythonImportsCheck = [ "requests_kerberos" ];
+ # avoid needing to package krb5
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "pyspnego[kerberos]" "pyspnego"
+ '';
+
+ pythonImportsCheck = [
+ "requests_kerberos"
+ ];
meta = with lib; {
description = "An authentication handler for using Kerberos with Python Requests";
diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix
index 946e406c8bf6..57f4d5787c67 100644
--- a/pkgs/development/python-modules/requests-unixsocket/default.nix
+++ b/pkgs/development/python-modules/requests-unixsocket/default.nix
@@ -9,26 +9,35 @@
buildPythonPackage rec {
pname = "requests-unixsocket";
- version = "0.2.0";
+ version = "0.3.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea";
+ hash = "sha256-KDBCg+qTV9Rf/1itWxHkdwjPv1gGgXqlmyo2Mijulx4=";
};
- nativeBuildInputs = [ pbr ];
- propagatedBuildInputs = [ requests ];
+ nativeBuildInputs = [
+ pbr
+ ];
- checkInputs = [ pytestCheckHook waitress ];
+ propagatedBuildInputs = [
+ requests
+ ];
- preCheck = ''
- rm pytest.ini
- '';
+ checkInputs = [
+ pytestCheckHook
+ waitress
+ ];
+
+ pythonImportsCheck = [
+ "requests_unixsocket"
+ ];
meta = with lib; {
description = "Use requests to talk HTTP via a UNIX domain socket";
homepage = "https://github.com/msabramo/requests-unixsocket";
license = licenses.asl20;
- maintainers = [ maintainers.catern ];
+ maintainers = with maintainers; [ catern ];
};
}
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 8ba7aef46074..f5b021801f41 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -7,22 +7,23 @@
, charset-normalizer
, fetchPypi
, idna
+, isPy27
+, isPy3k
+, pysocks
, pytest-mock
, pytest-xdist
, pytestCheckHook
-, urllib3
-, isPy27
-, isPy3k
, trustme
+, urllib3
}:
buildPythonPackage rec {
pname = "requests";
- version = "2.26.0";
+ version = "2.27.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c=";
+ hash = "sha256-aNfFb9WomZiHco7zBKbRLtx7508c+kdxT8i0FFJcmmE=";
};
patches = [
@@ -32,7 +33,8 @@ buildPythonPackage rec {
postPatch = ''
# Use latest idna
- substituteInPlace setup.py --replace ",<3" ""
+ substituteInPlace setup.py \
+ --replace ",<3" ""
'';
propagatedBuildInputs = [
@@ -48,6 +50,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ pysocks
pytest-mock
pytest-xdist
pytestCheckHook
@@ -73,11 +76,13 @@ buildPythonPackage rec {
"TestTimeout"
];
- pythonImportsCheck = [ "requests" ];
+ pythonImportsCheck = [
+ "requests"
+ ];
meta = with lib; {
- description = "Simple HTTP library for Python";
- homepage = "http://docs.python-requests.org/en/latest/";
+ description = "HTTP library for Python";
+ homepage = "http://docs.python-requests.org/";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix
index 71cb33560e05..3d51f4741af6 100644
--- a/pkgs/development/python-modules/requirements-parser/default.nix
+++ b/pkgs/development/python-modules/requirements-parser/default.nix
@@ -1,31 +1,44 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, nose
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, types-setuptools
}:
+
buildPythonPackage rec {
pname = "requirements-parser";
- version = "0.2.0";
+ version = "0.5.0";
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "madpah";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk=";
};
- checkInputs = [
- nose
+ nativeBuildInputs = [
+ poetry-core
];
- checkPhase = ''
- nosetests
- '';
+ propagatedBuildInputs = [
+ types-setuptools
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
pythonImportsCheck = [
"requirements"
];
meta = with lib; {
- description = "A Pip requirements file parser";
+ description = "Pip requirements file parser";
homepage = "https://github.com/davidfischer/requirements-parser";
license = licenses.bsd2;
maintainers = teams.determinatesystems.members;
diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix
index f5c1f4357268..30345ae654e4 100644
--- a/pkgs/development/python-modules/resolvelib/default.nix
+++ b/pkgs/development/python-modules/resolvelib/default.nix
@@ -26,6 +26,10 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportsCheck = [
+ "resolvelib"
+ ];
+
meta = with lib; {
description = "Resolve abstract dependencies into concrete ones";
homepage = "https://github.com/sarugaku/resolvelib";
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index cff31f782c5a..86e37419c72d 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -1,8 +1,6 @@
{ lib
, buildPythonPackage
-, cookies
, fetchPypi
-, mock
, pytest-localserver
, pytestCheckHook
, pythonOlder
@@ -13,21 +11,20 @@
buildPythonPackage rec {
pname = "responses";
- version = "0.16.0";
+ version = "0.17.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-ouOsoqgnfmElfNOxwVSx3Q14Kxrj04t/o3y+P+tTF5E=";
+ hash = "sha256-7GdeCA0Gv40fteWmih5c0N9GsJx4IwMV9lCvXkA2vsc=";
};
propagatedBuildInputs = [
requests
- urllib3
six
- ] ++ lib.optionals (pythonOlder "3.4") [
- cookies
- ] ++ lib.optionals (pythonOlder "3.3") [
- mock
+ urllib3
];
checkInputs = [
@@ -35,7 +32,9 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "responses" ];
+ pythonImportsCheck = [
+ "responses"
+ ];
meta = with lib; {
description = "Python module for mocking out the requests Python library";
diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix
index d085d43008bb..51d88446c0b5 100644
--- a/pkgs/development/python-modules/respx/default.nix
+++ b/pkgs/development/python-modules/respx/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "respx";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "lundberg";
repo = pname;
rev = version;
- sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8=";
+ sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix
index f4490c72876d..62b419def880 100644
--- a/pkgs/development/python-modules/retworkx/default.nix
+++ b/pkgs/development/python-modules/retworkx/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "retworkx";
- version = "0.9.0";
+ version = "0.11.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -25,13 +25,13 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "retworkx";
rev = version;
- hash = "sha256-1W7DexS+ECAPsxyZAF36xcEguFkjUMX9lDBylNVPqyk=";
+ hash = "sha256-o3XPMTaiFH5cBtyqtW650wiDBElLvCmERr2XwwdPO1c=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-y5l7jqrlk3ONHefZPS31IvcaO9ttXWLM7fIUmNVwbco=";
+ hash = "sha256-Zhk4m+HNtimhPWfiBLi9dqJ0fp2D8d0u9k6ROG0/jBo=";
};
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index 71a7d0730bdf..f8fcc9aef7ab 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -1,17 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, idna
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "rfc3986";
- version = "1.5.0";
+ version = "2.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835";
+ sha256 = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw=";
};
- propagatedBuildInputs = [ idna ];
+ propagatedBuildInputs = [
+ idna
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "rfc3986"
+ ];
meta = with lib; {
description = "Validating URI References per RFC 3986";
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index eca38c08f014..ec735c057abf 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rlp";
- version = "2.0.1";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "665e8312750b3fc5f7002e656d05b9dcb6e93b6063df40d95c49ad90c19d1f0e";
+ sha256 = "63b0465d2948cd9f01de449d7adfb92d207c1aef3982f20310f8009be4a507e8";
};
checkInputs = [ pytest hypothesis ];
diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index ed2ba7155c7e..012d899ef2a5 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
buildPythonPackage rec {
- version = "5.1.3";
+ version = "6.0.0";
pname = "robotframework-seleniumlibrary";
# no tests included in PyPI tarball
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "robotframework";
repo = "SeleniumLibrary";
rev = "v${version}";
- sha256 = "1djlrbrgd7v15xk5w90xk7iy98cr1p2g57k614gvbd298dmnf2wd";
+ sha256 = "1rjzz6mrx4zavcck2ry8269rf3dkvvs1qfa9ra7dkppbarrjin3f";
};
propagatedBuildInputs = [ robotframework selenium ];
diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix
index 81226a23452e..63e87609ac25 100644
--- a/pkgs/development/python-modules/robotstatuschecker/default.nix
+++ b/pkgs/development/python-modules/robotstatuschecker/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, python, robotframework }:
buildPythonPackage rec {
- version = "1.3";
+ version = "2.1.0";
pname = "robotstatuschecker";
# no tests included in PyPI tarball
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "robotframework";
repo = "statuschecker";
rev = version;
- sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln";
+ sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz";
};
propagatedBuildInputs = [ robotframework ];
diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix
index ccc5749387b1..c9c4c9af5ba5 100644
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "roonapi";
- version = "0.0.38";
+ version = "0.0.39";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "pavoni";
repo = "pyroon";
rev = version;
- sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60=";
+ sha256 = "03m00qbdkm0vdflc48ds186kh9qjxqr6z602yn3l6fzj5f93zgh5";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
index b12920fc7640..143452274abb 100644
--- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
@@ -5,12 +5,13 @@
buildPythonPackage rec {
pname = "ruamel-yaml-clib";
- version = "0.2.4";
+ version = "0.2.6";
+ format = "setuptools";
src = fetchhg {
url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
rev = version;
- sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc=";
+ sha256 = "sha256-mpkh9JhYKRX47jfKprjt1Vpm9DMz8LcWzkotJ+/xoxY=";
};
# no tests
diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index 4b6774a4f9fa..79f21ba6aabd 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "ruamel-yaml";
- version = "0.17.17";
+ version = "0.17.20";
src = fetchPypi {
pname = "ruamel.yaml";
inherit version;
- sha256 = "9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be";
+ sha256 = "sha256-S4ozwe+ytEOpP8qvz6TS5EX46MKcUo2fXNr7fMnkAEw=";
};
# Tests use relative paths
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 22d7eb1a09f6..d90d1052282d 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "s3fs";
- version = "2021.11.1";
+ version = "2022.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1a9ea7596663cda3a5dc6802f11eb468b397de35a8793750e9a98c65abd1a114";
+ sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index aad121729408..80c4bd92a385 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.75.0";
+ version = "2.75.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-zTaySMjvhh+cx/0ZO5R1uf0O8lIszwtoq1ua4jZ7WFE=";
+ sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix
index c99a78e0cc18..4bc446c2e142 100644
--- a/pkgs/development/python-modules/sanic-testing/default.nix
+++ b/pkgs/development/python-modules/sanic-testing/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "sanic-testing";
- version = "0.7.0";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "sanic-org";
repo = "sanic-testing";
rev = "v${version}";
- sha256 = "0ib6rf1ly1059lfprc3hpmy377c3wfgfhnar6n4jgbxiyin7vzm7";
+ sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 2fab2a3df889..660ca5de80bf 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "sanic";
- version = "21.9.3";
+ version = "21.12.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "sanic-org";
repo = pname;
rev = "v${version}";
- sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i";
+ sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g";
};
postPatch = ''
@@ -73,9 +73,24 @@ buildPythonPackage rec {
preCheck = ''
# Some tests depends on sanic on PATH
PATH="$out/bin:$PATH"
+ PYTHONPATH=$PWD:$PYTHONPATH
+
+ # needed for relative paths for some packages
+ cd tests
'';
+ # uvloop usage is buggy
+ #SANIC_NO_UVLOOP = true;
+
+ pytestFlagsArray = [
+ "--asyncio-mode=auto"
+ ];
+
disabledTests = [
+ # Lack of uvloop setup through fixtures
+ "test_create_asyncio_server"
+ "test_listeners_triggered_async"
+ "test_tls_options"
# Tests are flaky
"test_keep_alive_client_timeout"
"test_check_timeouts_request_timeout"
@@ -103,6 +118,14 @@ buildPythonPackage rec {
"test_version"
];
+ disabledTestPaths = [
+ # unable to create async loop
+ "test_app.py"
+ "test_asgi.py"
+ # occasionally hangs
+ "test_multiprocessing.py"
+ ];
+
# avoid usage of nixpkgs-review in darwin since tests will compete usage
# for the same local port
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix
index 58cdfe646c65..8375c62e979f 100644
--- a/pkgs/development/python-modules/sapi-python-client/default.nix
+++ b/pkgs/development/python-modules/sapi-python-client/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "sapi-python-client";
- version = "0.1.3";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "keboola";
repo = pname;
rev = version;
- sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6";
+ sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix
index bf3e1d1ef469..cf2e524337de 100644
--- a/pkgs/development/python-modules/scikit-tda/default.nix
+++ b/pkgs/development/python-modules/scikit-tda/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "scikit-tda";
- version = "0.0.4";
+ version = "1.0.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "scikit-tda";
repo = "scikit-tda";
- rev = version;
- sha256 = "0a90k6i9fkmc9gf250b4fidx2fzd2qrn025l74mjk51fvf23q13a";
+ rev = "v${version}";
+ sha256 = "0yhmf5jmxywyj6l9q0rfv9r8wpdk063fvvfnb4azwwccblgz37rj";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix
index 4b1d79d0e572..c9b6d7c96808 100644
--- a/pkgs/development/python-modules/sendgrid/default.nix
+++ b/pkgs/development/python-modules/sendgrid/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "sendgrid";
- version = "6.9.5";
+ version = "6.9.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = pname;
repo = "sendgrid-python";
rev = version;
- sha256 = "1r8xh0c6wivrajj6gl1hv25vsb9i79n19nd4x53207i5vz9d55g5";
+ sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 81276f4e338d..2ab609c7d0c1 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -6,22 +6,23 @@
, semantic-version
, setuptools
, setuptools-scm
+, typing-extensions
, toml
}:
buildPythonPackage rec {
pname = "setuptools-rust";
- version = "0.12.1";
+ version = "1.1.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e";
+ sha256 = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1";
};
nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ semantic-version setuptools toml ];
+ propagatedBuildInputs = [ semantic-version setuptools toml typing-extensions ];
doCheck = false;
pythonImportsCheck = [ "setuptools_rust" ];
diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix
index 62568869b7bf..c175cfb4c609 100644
--- a/pkgs/development/python-modules/setuptools-scm/default.nix
+++ b/pkgs/development/python-modules/setuptools-scm/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "setuptools-scm";
- version = "6.3.2";
+ version = "6.4.2";
src = fetchPypi {
pname = "setuptools_scm";
inherit version;
- sha256 = "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4";
+ sha256 = "sha256-aDOsZcbtlxGk1dImb4Akz6B8UzoOVfTBL27/KApanjA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix
index 30d6610f773e..fa813c4b5fd1 100644
--- a/pkgs/development/python-modules/simplisafe-python/default.nix
+++ b/pkgs/development/python-modules/simplisafe-python/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
- version = "2022.02.0";
+ version = "2022.02.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-f3kRBqBQQwo74fDFVLE5pZArsmc8iFgU/onifKy2vNQ=";
+ sha256 = "sha256-r+TcSzFkEGRsuTtEHBT/GMNa9r6GsIyvbLaF32cFfeQ=";
};
nativeBuildInputs = [
@@ -40,7 +40,6 @@ buildPythonPackage rec {
backoff
docutils
pytz
- types-pytz
voluptuous
websockets
];
@@ -51,6 +50,7 @@ buildPythonPackage rec {
pytest-aiohttp
pytest-asyncio
pytestCheckHook
+ types-pytz
];
postPatch = ''
diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix
index 800cf0842582..5e8344e3d637 100644
--- a/pkgs/development/python-modules/smmap/default.nix
+++ b/pkgs/development/python-modules/smmap/default.nix
@@ -2,10 +2,10 @@
buildPythonPackage rec {
pname = "smmap";
- version = "4.0.0";
+ version = "5.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182";
+ sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936";
};
checkInputs = [ nosexcover ];
diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
index 757c945f3f05..2f70732caa31 100644
--- a/pkgs/development/python-modules/spacy-transformers/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
postPatch = ''
- sed -i 's/transformers>=3.4.0,<4.12.0/transformers/' setup.cfg
+ sed -i 's/transformers>=3.4.0,<4.13.0/transformers/' setup.cfg
'';
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 05561e995a5c..80c66bccc302 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -64,6 +64,11 @@ buildPythonPackage rec {
langcodes
] ++ lib.optional (pythonOlder "3.8") typing-extensions;
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic~=1.2"
+ '';
+
checkInputs = [
pytest
];
diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix
index 6f721ad1a8f6..7f5ea8c4241a 100644
--- a/pkgs/development/python-modules/sphinx-jinja/default.nix
+++ b/pkgs/development/python-modules/sphinx-jinja/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "sphinx-jinja";
- version = "1.1.1";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0hz13vc65zi4zmay40nz8wzxickv1q9zzl6x03qc7rvvapz0c91p";
+ sha256 = "e6614d986c0289cb85b016c25eb8cb9781ceb841e70bee639c5123f39ad90b38";
};
buildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 75693f3657e4..19961cc2ec18 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -8,12 +8,13 @@
, alabaster
, docutils
, imagesize
+, importlib-metadata
, jinja2
, packaging
, pygments
, requests
-, setuptools
, snowballstemmer
+, sphinxcontrib-apidoc
, sphinxcontrib-applehelp
, sphinxcontrib-devhelp
, sphinxcontrib-htmlhelp
@@ -29,14 +30,14 @@
buildPythonPackage rec {
pname = "sphinx";
- version = "4.3.1";
+ version = "4.4.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "sphinx-doc";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA=";
+ sha256 = "sha256-Q4CqPO08AfR+CDB02al65A+FHRFUDUfFTba0u8YQx+8=";
extraPostFetch = ''
cd $out
mv tests/roots/test-images/testimäge.png \
@@ -54,7 +55,6 @@ buildPythonPackage rec {
packaging
pygments
requests
- setuptools
snowballstemmer
sphinxcontrib-applehelp
sphinxcontrib-devhelp
@@ -64,6 +64,11 @@ buildPythonPackage rec {
sphinxcontrib-serializinghtml
# extra[docs]
sphinxcontrib-websupport
+
+ # extra plugins which are otherwise not found by sphinx-build
+ sphinxcontrib-apidoc
+ ] ++ lib.optionals (pythonOlder "3.10") [
+ importlib-metadata
];
checkInputs = [
@@ -114,6 +119,6 @@ buildPythonPackage rec {
'';
homepage = "https://www.sphinx-doc.org";
license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ maintainers = teams.sphinx.members;
};
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix
new file mode 100644
index 000000000000..c7bdb26b0008
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+}:
+
+buildPythonPackage rec {
+ pname = "sphinxcontrib-apidoc";
+ version = "0.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k=";
+ };
+
+ postPatch = ''
+ # break infite recursion, remove pytest 4 requirement
+ rm test-requirements.txt requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ pbr
+ ];
+
+ # Check is disabled due to circular dependency of sphinx
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Sphinx extension for running sphinx-apidoc on each build";
+ homepage = "https://github.com/sphinx-contrib/apidoc";
+ license = licenses.bsd2;
+ maintainers = teams.openstack.members;
+ };
+}
diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
index 9c3c16657f29..ef7a50382c6e 100644
--- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix
@@ -14,14 +14,13 @@ buildPythonPackage rec {
sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58";
};
-
# Check is disabled due to circular dependency of sphinx
doCheck = false;
meta = with lib; {
description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books";
- homepage = "http://sphinx-doc.org/";
+ homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp";
license = licenses.bsd0;
+ maintainers = teams.sphinx.members;
};
-
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
index 1f33c06b984e..293f4c856ef5 100644
--- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix
@@ -12,14 +12,13 @@ buildPythonPackage rec {
sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4";
};
-
# Check is disabled due to circular dependency of sphinx
doCheck = false;
meta = with lib; {
description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document.";
- homepage = "http://sphinx-doc.org/";
+ homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp";
license = licenses.bsd0;
+ maintainers = teams.sphinx.members;
};
-
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
index 51084adf6ed6..901132176ed9 100644
--- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix
@@ -14,14 +14,13 @@ buildPythonPackage rec {
sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2";
};
-
# Check is disabled due to circular dependency of sphinx
doCheck = false;
meta = with lib; {
description = "Sphinx extension which renders HTML help files";
- homepage = "http://sphinx-doc.org/";
+ homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp";
license = licenses.bsd0;
+ maintainers = teams.sphinx.members;
};
-
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
index cd67732605bb..da630c6ee96d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix
@@ -14,14 +14,13 @@ buildPythonPackage rec {
sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8";
};
-
# Check is disabled due to circular dependency of sphinx
doCheck = false;
meta = with lib; {
description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript.";
- homepage = "http://sphinx-doc.org/";
+ homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath";
license = licenses.bsd0;
+ maintainers = teams.sphinx.members;
};
-
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
index 9d16ede62a20..4364fcb99dc6 100644
--- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix
@@ -14,14 +14,13 @@ buildPythonPackage rec {
sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72";
};
-
# Check is disabled due to circular dependency of sphinx
doCheck = false;
meta = with lib; {
description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.";
- homepage = "http://sphinx-doc.org/";
+ homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp";
license = licenses.bsd0;
+ maintainers = teams.sphinx.members;
};
-
}
diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
index a238c0191a7b..85ed3cdc596d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix
@@ -14,14 +14,13 @@ buildPythonPackage rec {
sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952";
};
-
# Check is disabled due to circular dependency of sphinx
doCheck = false;
meta = with lib; {
description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle).";
- homepage = "http://sphinx-doc.org/";
+ homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml";
license = licenses.bsd0;
+ maintainers = teams.sphinx.members;
};
-
}
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 4c43ce2f1617..4ddacc911903 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "spyder-kernels";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "6b19ea224f183dbff8ff0031bee35ae6b5b3a6eef4aa84cfab04e3bc3e304b91";
+ sha256 = "574ee1bd03f7236b9f9dacae34936a0625cd67ccfe3df11fec69f26889a0b866";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 38558f004984..419ac6bbb39c 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "spyder";
- version = "5.2.0";
+ version = "5.2.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08";
+ sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28";
};
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
index 685bb829dd3b..05ef00dae0ef 100644
--- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "sqlalchemy-utils";
- version = "0.37.9";
+ version = "0.38.2";
src = fetchPypi {
inherit version;
pname = "SQLAlchemy-Utils";
- sha256 = "4667edbdcb1ece011076b69772ef524bfbb17cc97e03f11ee6b85d98e7741d61";
+ sha256 = "9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 085195f5a752..1d6406c5db13 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.4.29";
+ version = "1.4.31";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256:+iutFOFHS6ZJz8lpwdLskV3T55Z380a7/gjpPvkCCzk=";
+ sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix
index 1c28d6a0976d..178617e18dea 100644
--- a/pkgs/development/python-modules/sqlitedict/default.nix
+++ b/pkgs/development/python-modules/sqlitedict/default.nix
@@ -1,22 +1,28 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "sqlitedict";
- version = "1.6.0";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "RaRe-Technologies";
repo = "sqlitedict";
rev = version;
- sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m";
+ sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28";
};
- checkInputs = [ pytest ];
-
- checkPhase = ''
- pytest tests
+ preCheck = ''
+ mkdir tests/db
'';
+ checkInputs = [
+ pytestCheckHook
+ ];
+
meta = with lib; {
description = "Persistent, thread-safe dict";
homepage = "https://github.com/RaRe-Technologies/sqlitedict";
diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix
index c5d20436a09c..d0ac3602445d 100644
--- a/pkgs/development/python-modules/srpenergy/default.nix
+++ b/pkgs/development/python-modules/srpenergy/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "srpenergy";
- version = "1.3.5";
+ version = "1.3.6";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "lamoreauxlab";
repo = "srpenergy-api-client-python";
rev = version;
- sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI=";
+ hash = "sha256-aZnqGtfklWgigac2gdkQv29Qy5HC34zGGY2iWr2cOMo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index 90e4962d3e8f..3c53864ec332 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, paramiko
-, pytest
+, pytestCheckHook
, mock
}:
@@ -15,12 +15,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ paramiko ];
- checkInputs = [ pytest mock ];
+ checkInputs = [ pytestCheckHook mock ];
# disable impure tests
- checkPhase = ''
- pytest -k 'not connect_via_proxy and not read_ssh_config'
- '';
+ disabledTests = [
+ "test_get_keys"
+ "connect_via_proxy"
+ "read_ssh_config"
+ ];
meta = with lib; {
description = "Pure python SSH tunnels";
diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix
index 587572646abc..f76ba96a5b8f 100644
--- a/pkgs/development/python-modules/sslyze/default.nix
+++ b/pkgs/development/python-modules/sslyze/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "sslyze";
- version = "5.0.0";
+ version = "5.0.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nabla-c0d3";
repo = pname;
rev = version;
- hash = "sha256-7kUriEMHcGCXKs42KVWxXvM+JEEWf/8tnuoGujHbqHY=";
+ hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk=";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 9612ac999cc8..1084a50be770 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -12,7 +12,6 @@
, requests
, aiosqlite
, databases
-, pytest-asyncio
, pytestCheckHook
, pythonOlder
, trio
@@ -58,7 +57,6 @@ buildPythonPackage rec {
checkInputs = [
aiosqlite
databases
- pytest-asyncio
pytestCheckHook
trio
typing-extensions
diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix
index 44cd64821d9d..ac3c173c09a5 100644
--- a/pkgs/development/python-modules/staticjinja/default.nix
+++ b/pkgs/development/python-modules/staticjinja/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
- sha256 = "sha256-YHhGohA24D4O/Bj7JZTj8qaEGEZAupvxWcZYjWFTHmM=";
+ sha256 = "0qqyadhqsn66b7qrpfj08qc899pjwfa2byqqzh73xq1n22i4cy30";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index 173458a634b6..0f01870c41b4 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "statsmodels";
- version = "0.13.1";
+ version = "0.13.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69";
+ sha256 = "sha256-d9wpLJk5wDakdvF3D50Il2sFQ32qIpko2nMjEUfN59Q=";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 2e90d3350dbe..b6eb0c2672ad 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "structlog";
- version = "21.4.0";
+ version = "21.5.0";
format = "flit";
# sdist is missing conftest.py
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "hynek";
repo = "structlog";
rev = version;
- sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg=";
+ sha256 = "0bc5lj0732j0hjq89llgrncyzs6k3aaffvg07kr3la44w0hlrb4l";
};
checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ];
diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix
index 92cd344edb6d..4757cd323186 100644
--- a/pkgs/development/python-modules/stups-pierone/default.nix
+++ b/pkgs/development/python-modules/stups-pierone/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "stups-pierone";
- version = "1.1.45";
+ version = "1.1.49";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "zalando-stups";
repo = "pierone-cli";
rev = version;
- sha256 = "1ggfizw27wpcagbbk15xpfrhq6b250cx4278b5d7y8s438g128cs";
+ sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index 7114f0aeba48..55cea70924e6 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -7,14 +7,14 @@
buildPythonApplication rec {
pname = "sybil";
- version = "2.0.1";
+ version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524";
+ sha256 = "sha256-dpLtZueT5eea5qcM8s+GGRftSOr/DYrfgl5k2Fgg8lE=";
};
checkInputs = [
@@ -22,9 +22,9 @@ buildPythonApplication rec {
];
disabledTests = [
- # Will be fixed with 3.0.0, https://github.com/simplistix/sybil/pull/27
- "test_future_imports"
- "test_pytest"
+ # sensitive to output of other commands
+ "test_namespace"
+ "test_unittest"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix
index 9e0b83bc925d..abbf70df62fb 100644
--- a/pkgs/development/python-modules/tappy/default.nix
+++ b/pkgs/development/python-modules/tappy/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "tap.py";
- version = "3.0";
+ version = "3.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA=";
+ sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1";
};
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix
new file mode 100644
index 000000000000..e378227b2f56
--- /dev/null
+++ b/pkgs/development/python-modules/teamcity-messages/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "teamcity-messages";
+ version = "1.30";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "JetBrains";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-5C9ElCmTH+xSrFQ/x9IRJ89RfSd9cxzkETlOCzwyU8s=";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "tests/unit-tests/"
+ ];
+
+ pythonImportsCheck = [
+ "teamcity"
+ ];
+
+ meta = with lib; {
+ description = "Python unit test reporting to TeamCity";
+ homepage = "https://github.com/JetBrains/teamcity-messages";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index e9cd3e84fee5..6999655c5dc5 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "tempora";
- version = "4.1.2";
+ version = "5.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fd6cafd66b01390d53a760349cf0b3123844ec6ae3d1043d7190473ea9459138";
+ sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26";
};
disabled = pythonOlder "3.2";
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 776fbaa18019..47acd1f53c75 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -413,8 +413,10 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar ];
platforms = with platforms; linux ++ darwin;
- timeout = 86400; # 24 hours, needed for darwin
broken = !(xlaSupport -> cudaSupport);
+ } // lib.optionalAttrs stdenv.isDarwin {
+ timeout = 86400; # 24 hours
+ maxSilent = 14400; # 4h, double the default of 7200s
};
};
diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix
index cb528b5b4e9a..7b548b763fdf 100644
--- a/pkgs/development/python-modules/terminaltables/default.nix
+++ b/pkgs/development/python-modules/terminaltables/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "terminaltables";
- version = "3.1.7";
+ version = "3.1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "5dab2f33927c0a020b8011c81b92830ff9fd4ba701657da5d7bfdc41048360a6";
+ sha256 = "ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix
index f0c26292c84b..1cc20cc2cca7 100644
--- a/pkgs/development/python-modules/test-tube/default.nix
+++ b/pkgs/development/python-modules/test-tube/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "test-tube";
- version = "0.7.5";
+ version = "0.628";
disabled = isPy27;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "williamFalcon";
repo = pname;
rev = version;
- sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2";
+ sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index b582bf4bc7f7..93fc92bd6320 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -14,6 +14,12 @@ buildPythonPackage rec {
pname = "testfixtures";
version = "6.18.3";
format = "setuptools";
+ # DO NOT CONTACT upstream.
+ # https://github.com/simplistix/ is only concerned with internal CI process.
+ # Any attempt by non-standard pip workflows to comment on issues will
+ # be met with hostility.
+ # https://github.com/simplistix/testfixtures/issues/169
+ # https://github.com/simplistix/testfixtures/issues/168
disabled = pythonOlder "3.6";
@@ -22,6 +28,9 @@ buildPythonPackage rec {
sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0=";
};
+ # no longer compatible with sybil
+ # https://github.com/simplistix/testfixtures/issues/169
+ doCheck = false;
checkInputs = [
mock
pytestCheckHook
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index ee2e2bb2c993..2eae44aeeb27 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -23,6 +23,7 @@ buildPythonPackage rec {
pname = "textacy";
version = "0.12.0";
disabled = pythonOlder "3.7";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index bdd6ad241158..b310defa45d1 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "tiledb";
- version = "0.6.6";
+ version = "0.12.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "TileDB-Inc";
repo = "TileDB-Py";
rev = version;
- sha256 = "0b2kn1xyf7d994kz29dpqiaf8yzvx0axw4yqi854c54pl22ddgzl";
+ sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix
index 8ad393bd35f1..29f2ffbc49b9 100644
--- a/pkgs/development/python-modules/timetagger/default.nix
+++ b/pkgs/development/python-modules/timetagger/default.nix
@@ -9,13 +9,13 @@
python3Packages.buildPythonPackage rec {
pname = "timetagger";
- version = "22.2.1";
+ version = "22.2.2";
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2Yne9gTMyuwqBNYz7elzW09olmgIKeRyuO0LdrtYt5c=";
+ sha256 = "sha256-U2OvvS61t4RnWAA/mv84TWRj+/8SRRXrBR+fX3bakqw=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 72d9604e8689..10a6e3b00d50 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -2,30 +2,39 @@
, buildPythonPackage
, fetchFromGitHub
, requests
+, pythonOlder
}:
buildPythonPackage rec {
pname = "tmb";
- version = "0.1.1";
+ version = "0.1.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "alemuro";
repo = pname;
rev = version;
- sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
+ hash = "sha256-/syHSu9LKLDe3awrgSIHh0hV+raWqKd53f43WagHn9c=";
};
VERSION = version;
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ pythonImportsCheck = [
+ "tmb"
+ ];
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "tmb" ];
meta = with lib; {
- homepage = "https://github.com/alemuro/tmb";
description = "Python library that interacts with TMB API";
+ homepage = "https://github.com/alemuro/tmb";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 1bbac9ce9da1..30c3f08f52e7 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "toggl-cli";
- version = "2.4.2";
+ version = "2.4.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "togglCli";
inherit version;
- sha256 = "1wgh231r16jyvaj1ch1pajvl9szflb4srs505pfdwdlqvz7rzww8";
+ sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index fd6cec70f060..6c8455f060ec 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "tomlkit";
- version = "0.7.2";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754";
+ sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1";
};
propagatedBuildInputs =
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 4774e09f0b6e..7b6384966ab1 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -24,13 +24,13 @@ let
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
in buildPythonPackage rec {
pname = "torchvision";
- version = "0.11.2";
+ version = "0.11.3";
src = fetchFromGitHub {
owner = "pytorch";
repo = "vision";
rev = "v${version}";
- sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i";
+ sha256 = "sha256-nJV0Jr6Uc+ALodAiekM6YpM6IbmIb4w+Jlc3bJRqayI=";
};
nativeBuildInputs = [ libpng ninja which ]
diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix
index b4343b5d5ff6..3be82e40a298 100644
--- a/pkgs/development/python-modules/tornado/4.nix
+++ b/pkgs/development/python-modules/tornado/4.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "tornado";
version = "4.5.3";
- disabled = isPy27;
+ disabled = isPy27 || python.pythonAtLeast "3.10";
# We specify the name of the test files to prevent
# https://github.com/NixOS/nixpkgs/issues/14634
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 8940a57196ac..2307073c3225 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tox";
- version = "3.24.4";
+ version = "3.24.5";
buildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca";
+ sha256 = "67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 606308f88967..3973d68b6c38 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
# pandas is not supported on i686 or risc-v
lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas;
+ pytestFlagsArray = [
+ # pytest-asyncio 0.17.0 compat; https://github.com/tqdm/tqdm/issues/1289
+ "--asyncio-mode=strict"
+ ];
+
# Remove performance testing.
# Too sensitive for on Hydra.
disabledTests = [
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 917aef54b6bf..814eb1640292 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.15.0";
+ version = "4.16.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "05qwrs040sqxk5fi44rjx0s5ba4897iw8l7yk8f1xzv314df05fg";
+ sha256 = "sha256-XF29JKIaOqZ/PdU+zu+wX7TAl1TKz+HcOutHDABc/PY=";
};
nativeBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix
index 0732f062b389..1e510db97221 100644
--- a/pkgs/development/python-modules/transmission-rpc/default.nix
+++ b/pkgs/development/python-modules/transmission-rpc/default.nix
@@ -18,10 +18,10 @@ buildPythonPackage rec {
format = "pyproject";
src = fetchFromGitHub {
- owner = "Trim21";
- repo = "transmission-rpc";
- rev = "v${version}";
- sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0=";
+ owner = "Trim21";
+ repo = "transmission-rpc";
+ rev = "v${version}";
+ sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0=";
};
# remove once upstream has tagged version with dumped typing-extensions
diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
index 4eac9ddeae12..f3271b9a3bb2 100644
--- a/pkgs/development/python-modules/treeo/default.nix
+++ b/pkgs/development/python-modules/treeo/default.nix
@@ -8,16 +8,21 @@
buildPythonPackage rec {
pname = "treeo";
- version = "0.0.9";
+ version = "0.4.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "cgarciae";
repo = pname;
rev = version;
- sha256 = "0jfqj5150braj4ybnifc6b8mp0w2j93li6bm20lcd7a19qs0lkk2";
+ sha256 = "176r1kgsdlylvdrxmhnzni81p8m9cfnsn4wwn6fnmsgam2qbp76j";
};
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'typing-extensions = "^3.10.0"' 'typing-extensions = "*"'
+ '';
+
nativeBuildInputs = [
poetry-core
];
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 31459b2afb50..d4da6ee6928a 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.9.43";
+ version = "3.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f7d4adf2df0fe19ea49c5f3268c33ffe28b3be818d280bb4c113d7463c58ddf9";
+ sha256 = "sha256-mPsV25oD8FlPSDOGHOX+nLCN/I6RS83l3efUCgavmHY=";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index 38faa10a9282..d4200bc66f7d 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -19,14 +19,14 @@ let
in
buildPythonPackage rec {
pname = "ttp";
- version = "0.7.2";
+ version = "0.8.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "dmulyalin";
repo = pname;
rev = version;
- sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk=";
+ sha256 = "0rnixz01dnxl1hmzh34v4w4c117ncldr33ws0m2hqhjf5n4kgrg3";
};
propagatedBuildInputs = [
@@ -57,6 +57,8 @@ buildPythonPackage rec {
disabledTestPaths = [
# missing package n2g
"test/pytest/test_N2G_formatter.py"
+ # missing test file
+ "test/pytest/test_extend_tag.py"
];
disabledTests = [
@@ -81,6 +83,10 @@ buildPythonPackage rec {
"test_excel_formatter_update_using_result_kwargs"
# missing package n2g
"test_n2g_formatter"
+ # missing test files
+ "test_TTP_CACHE_FOLDER_env_variable_usage"
+ # requires additional network setup
+ "test_child_group_do_not_start_if_no_parent_started"
];
pytestFlagsArray = [
diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix
index 236cfbb7ba0c..6309e8937a36 100644
--- a/pkgs/development/python-modules/tumpa/default.nix
+++ b/pkgs/development/python-modules/tumpa/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "tumpa";
- version = "0.1.1";
+ version = "0.1.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "kushaldas";
repo = "tumpa";
rev = "v${version}";
- sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq";
+ sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 12859fae86cc..ddc94541422c 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "twilio";
- version = "7.4.0";
+ version = "7.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = version;
- sha256 = "sha256-gN9cVBhiO34uj2ZGqXrnlvOlSaGxry0tMxaTK4SYhjM=";
+ sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index f5809b0a9b90..82c157722d28 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "twine";
- version = "3.4.2";
+ version = "3.7.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936";
+ sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 63e1502226d9..8b2ff2de5129 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "typeguard";
- version = "2.13.2";
+ version = "2.13.3";
src = fetchPypi {
inherit pname version;
- sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326";
+ sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4";
};
buildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix
index d4708e58706f..254dbabc703d 100644
--- a/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/pkgs/development/python-modules/types-protobuf/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-protobuf";
- version = "3.19.5";
+ version = "3.19.11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "9e3d954de5f5693817514b8da3476daa22f035d2b8060217c78c3831a1a49c23";
+ sha256 = "sha256-KveYV1TMFtD9Zpfk/aTol87721npYkqtZXLRwucAeHs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index c45b25329892..06f92bdc41ee 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.27.8";
+ version = "2.27.9";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-wvTkdU0HygqI/YqJu8bIqfkPtEH5ybVy/VxITwSBdIY=";
+ sha256 = "sha256-c2iXRTTSl5OUku/f2rIykwRAsR4iA/bfHwxA4yQqh+o=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix
index c8f520524184..affdbbb2b447 100644
--- a/pkgs/development/python-modules/types-toml/default.nix
+++ b/pkgs/development/python-modules/types-toml/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-toml";
- version = "0.10.3";
+ version = "0.10.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "215a7a79198651ec5bdfd66193c1e71eb681a42f3ef7226c9af3123ced62564a";
+ sha256 = "sha256-k0DnwVh3FVgbsTkFs68wt5/mivrM/KN3Zl1eY7aUEpo=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix
index 4962f2d02e3a..e08450c6a3e7 100644
--- a/pkgs/development/python-modules/types-typed-ast/default.nix
+++ b/pkgs/development/python-modules/types-typed-ast/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-typed-ast";
- version = "1.5.1";
+ version = "1.5.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-UQ876qlUkrNUTWfoFYGvopA8dktwiJ/82yhubGJn0pc=";
+ hash = "sha256-bY/S6pCDbLQxEayKrnzYZOCYWTyT7M66kP5G1rewxz4=";
};
# Module doesn't have tests
diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix
index 4d12af0689d8..0d7faf93f934 100644
--- a/pkgs/development/python-modules/ujson/default.nix
+++ b/pkgs/development/python-modules/ujson/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "ujson";
- version = "4.3.0";
+ version = "5.1.0";
disabled = isPyPy || pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0";
+ sha256 = "a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index c132f50dbea0..180baf0d4dde 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -14,7 +14,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ future ];
checkInputs = [ nose numpy ];
- checkPhase = "python setup.py nosetests -sv";
+ checkPhase = ''
+ nosetests -sv
+ '';
meta = with lib; {
homepage = "https://pythonhosted.org/uncertainties/";
diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix
index ae8cab53b0c5..e044176242d5 100644
--- a/pkgs/development/python-modules/unittest2/default.nix
+++ b/pkgs/development/python-modules/unittest2/default.nix
@@ -3,6 +3,7 @@
, fetchPypi
, six
, traceback2
+, pythonAtLeast
}:
buildPythonPackage rec {
@@ -16,14 +17,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six traceback2 ];
- # # 1.0.0 and up create a circle dependency with traceback2/pbr
+ # 1.0.0 and up create a circle dependency with traceback2/pbr
doCheck = false;
postPatch = ''
# argparse is needed for python < 2.7, which we do not support anymore.
substituteInPlace setup.py --replace "argparse" ""
- # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
+ # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
sed -i '510i\ return None, False' unittest2/loader.py
# https://github.com/pypa/packaging/pull/36
sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
@@ -31,8 +32,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "A backport of the new features added to the unittest testing framework";
- homepage = "https://pypi.python.org/pypi/unittest2";
+ homepage = "https://pypi.org/project/unittest2/";
license = licenses.bsd0;
+ # AttributeError: module 'collections' has no attribute 'MutableMapping'
+ broken = pythonAtLeast "3.10";
};
-
}
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index ef262e057e24..bf523046c616 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "uproot";
- version = "4.1.5";
+ version = "4.1.9";
# fetch from github for tests
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "uproot4";
rev = version;
- sha256 = "sha256-zsmAdqoWvFhRRRw4fdbRhhKkDV5oP/eYsfpA0AVqAnI=";
+ sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix
index 91bc6e68eb36..4c1a61b09fc6 100644
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -18,11 +18,12 @@
buildPythonPackage rec {
pname = "urllib3";
- version = "1.26.7";
+ version = "1.26.8";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-SYfGVVT3otvzDBj9SHeO8SSvb6t3GjdxA9oFheIzbs4=";
+ hash = "sha256-Dnwz2aY+fd/LhngKrIe+/C+930bFjbtIfghV987sKDw=";
};
propagatedBuildInputs = [
@@ -61,7 +62,9 @@ buildPythonPackage rec {
export CI # Increases LONG_TIMEOUT
'';
- pythonImportsCheck = [ "urllib3" ];
+ pythonImportsCheck = [
+ "urllib3"
+ ];
meta = with lib; {
description = "Powerful, sanity-friendly HTTP client for Python";
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index 57c6bf925357..4ce9228efee8 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "uvicorn";
- version = "0.14.0";
+ version = "0.16.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "164x92k3rs47ihkmwq5av396576dxp4rzv6557pwgc1ign2ikqy1";
+ sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s";
};
outputs = [
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index d51b3d783796..c463c37747ea 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "virtualenv";
- version = "20.10.0";
+ version = "20.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218";
+ sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index d664cf1d27fe..ddf6ce54b25e 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -10,12 +10,12 @@
}:
buildPythonPackage rec {
pname = "vivisect";
- version = "1.0.5";
+ version = "1.0.7";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "f629dc0143656b06b64e2da1772deda67d37a3e048e74bd728de4a4f24bf877b";
+ sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
index 1b62c918f339..d0a192fcc57b 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -1,27 +1,51 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, six
+, fetchFromGitHub
+, pythonOlder
, jsonpatch
, jsonschema
-, jsonpointer
+, six
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "warlock";
version = "1.3.3";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "bcwaldon";
+ repo = pname;
+ rev = version;
+ hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0=";
};
- propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ];
+ propagatedBuildInputs = [
+ jsonpatch
+ jsonschema
+ six
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "jsonschema>=0.7,<4" "jsonschema"
+ sed -i "/--cov/d" pytest.ini
+ '';
+
+ pythonImportsCheck = [
+ "warlock"
+ ];
meta = with lib; {
- homepage = "https://github.com/bcwaldon/warlock";
description = "Python object model built on JSON schema and JSON patch";
+ homepage = "https://github.com/bcwaldon/warlock";
license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
-
}
diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix
index dff14d15b901..4a99f048d1a6 100644
--- a/pkgs/development/python-modules/wasmer/default.nix
+++ b/pkgs/development/python-modules/wasmer/default.nix
@@ -5,7 +5,6 @@
, fetchFromGitHub
, buildPythonPackage
, libiconv
-, llvm_11
, libffi
, libxml2
, ncurses
@@ -21,7 +20,7 @@ let
, extraBuildInputs ? [ ]
}: buildPythonPackage rec {
inherit pname;
- version = "1.0.0";
+ version = "1.1.0";
format = "pyproject";
outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout";
@@ -30,7 +29,7 @@ let
owner = "wasmerio";
repo = "wasmer-python";
rev = version;
- hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
+ hash = "sha256-nOeOhQ1XY+9qmLGURrI5xbgBUgWe5XRpV38f73kKX2s=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
@@ -74,26 +73,26 @@ rec {
wasmer = common {
pname = "wasmer";
buildAndTestSubdir = "packages/api";
- cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";
+ cargoHash = "sha256-twoog8LjQtoli+TlDipSuB7yLFkXQJha9BqobqgZW3Y=";
};
wasmer-compiler-cranelift = common {
pname = "wasmer-compiler-cranelift";
buildAndTestSubdir = "packages/compiler-cranelift";
- cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI=";
+ cargoHash = "sha256-IqeMOY6emhIC7ekH8kIOZCr3JVkjxUg/lQli+ZZpdq4=";
};
wasmer-compiler-llvm = common {
pname = "wasmer-compiler-llvm";
buildAndTestSubdir = "packages/compiler-llvm";
- cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A=";
- extraNativeBuildInputs = [ llvm_11 ];
+ cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA=";
+ extraNativeBuildInputs = [ rustPlatform.rust.rustc.llvm ];
extraBuildInputs = [ libffi libxml2.out ncurses zlib ];
};
wasmer-compiler-singlepass = common {
pname = "wasmer-compiler-singlepass";
buildAndTestSubdir = "packages/compiler-singlepass";
- cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8=";
+ cargoHash = "sha256-4nZHMCNumNhdGPOmHXlJ5POYP7K+VPjwhEUMgzGb/Rk=";
};
}
diff --git a/pkgs/development/python-modules/wazeroutecalculator/default.nix b/pkgs/development/python-modules/wazeroutecalculator/default.nix
index dd8409624648..063f26e47660 100644
--- a/pkgs/development/python-modules/wazeroutecalculator/default.nix
+++ b/pkgs/development/python-modules/wazeroutecalculator/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "wazeroutecalculator";
- version = "0.13";
+ version = "0.14";
src = fetchPypi {
pname = "WazeRouteCalculator";
inherit version;
- sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg=";
+ sha256 = "01a6e8d7d896279fd342fd7fcb86c2b9bf97503d95e8b1a926867d504c4836ab";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix
index e92b47d20933..31cedc7b4032 100644
--- a/pkgs/development/python-modules/webargs/default.nix
+++ b/pkgs/development/python-modules/webargs/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "webargs";
- version = "8.0.1";
+ version = "8.1.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614";
+ sha256 = "f1f0b7f054a22263cf750529fc0926709ca47da9a2c417d423ad88d9fa6a5d33";
};
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix
index 9622f10168f1..116f45f16dd3 100644
--- a/pkgs/development/python-modules/websocket-client/default.nix
+++ b/pkgs/development/python-modules/websocket-client/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "websocket-client";
- version = "1.2.2";
+ version = "1.2.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "21861f8645eb5725d1becfe86d7e7ae1a31d98b72556f9d44fcc5100976353cf";
+ sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 2e13d95c3825..7d6f78902d0a 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -23,11 +23,25 @@ buildPythonPackage rec {
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
doCheck = !stdenv.isDarwin;
- # Disable all tests that need to terminate within a predetermined amount of
- # time. This is nondeterministic.
patchPhase = ''
+ # Disable all tests that need to terminate within a predetermined amount of
+ # time. This is nondeterministic.
sed -i 's/with self.assertCompletesWithin.*:/if True:/' \
tests/legacy/test_protocol.py
+
+ # Disables tests relying on tight timeouts to avoid failures like:
+ # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout
+ # ping_1_again, ping_2 = tuple(self.protocol.pings)
+ # ValueError: too many values to unpack (expected 2)
+ for t in \
+ test_keepalive_ping_stops_when_connection_closing \
+ test_keepalive_ping_does_not_crash_when_connection_lost \
+ test_keepalive_ping \
+ test_keepalive_ping_not_acknowledged_closes_connection \
+ test_keepalive_ping_with_no_ping_timeout \
+ ; do
+ sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py
+ done
'';
checkPhase = ''
diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix
index 999d2560591d..8ec42598ee61 100644
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -2,26 +2,25 @@
, buildPythonPackage
, fetchPypi
, isPy27
-, nose
, webob
, six
, beautifulsoup4
, waitress
-, mock
, pyquery
, wsgiproxy2
, pastedeploy
+, pytestCheckHook
}:
buildPythonPackage rec {
- version = "2.0.35";
+ version = "3.0.0";
pname = "webtest";
disabled = isPy27; # paste.deploy is not longer a valid import
src = fetchPypi {
pname = "WebTest";
inherit version;
- sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc=";
+ sha256 = "54bd969725838d9861a9fa27f8d971f79d275d94ae255f5c501f53bb6d9929eb";
};
postPatch = ''
@@ -36,8 +35,7 @@ buildPythonPackage rec {
];
checkInputs = [
- nose
- mock
+ pytestCheckHook
pastedeploy
wsgiproxy2
pyquery
diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index 0e00a08145e6..a843aa5c05cc 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "weconnect-mqtt";
- version = "0.21.0";
+ version = "0.28.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-mqtt";
rev = "v${version}";
- sha256 = "sha256-wagFjVXTjYFryaUiVeqU+T9ya+NzUFMX3uPlRZGe1v0=";
+ sha256 = "sha256-WrKJy4CxRJ/X599+95mfCQIhVcsLPnSPNtv3oAISSfU=";
};
propagatedBuildInputs = [
@@ -32,6 +32,8 @@ buildPythonPackage rec {
substituteInPlace pytest.ini \
--replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""
+ substituteInPlace requirements.txt \
+ --replace "weconnect[Images]~=0.33.0" "weconnect"
'';
checkInputs = [
diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index 70da78edb603..8af5acb70057 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "weconnect";
- version = "0.28.0";
+ version = "0.35.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-python";
rev = "v${version}";
- sha256 = "sha256-J7T62L6wT9rkl/Ukf2y5kBbJEdzh2XnGgCgedkxVEmA=";
+ sha256 = "sha256-Rx9OTx3GNIIRo7jIDIp8i6vGUFwn1keg5ifXqzewr4I=";
};
propagatedBuildInputs = [
@@ -40,6 +40,8 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
+ substituteInPlace requirements.txt \
+ --replace "pillow~=9.0.0" "pillow"
substituteInPlace pytest.ini \
--replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
index 1b899b59897f..62298b0d6ac4 100644
--- a/pkgs/development/python-modules/wheel/default.nix
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "wheel";
- version = "0.36.2";
+ version = "0.37.1";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "13bj49psan1s1fxfrq613dm2l7jvrg2dpgb36lz81z3b1h7zig6j";
+ sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs=";
name = "${pname}-${version}-source";
extraPostFetch = ''
cd $out
@@ -37,7 +37,7 @@ buildPythonPackage rec {
pipInstallFlags = [ "--ignore-installed" ];
meta = with lib; {
- homepage = "https://bitbucket.org/pypa/wheel/";
+ homepage = "https://github.com/pypa/wheel";
description = "A built-package format for Python";
longDescription = ''
This library is the reference implementation of the Python wheel packaging standard,
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index ef69283e6dbf..b2875819646c 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -2,25 +2,34 @@
, buildPythonPackage
, fetchFromGitHub
, inetutils
+, pythonOlder
}:
buildPythonPackage rec {
pname = "whois";
- version = "0.9.13";
+ version = "0.9.14";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "DannyCork";
repo = "python-whois";
rev = version;
- sha256 = "0y2sfs6nkr2j2crrn81wkfdzn9aphb3iaddya5zd2midlgdqq7bw";
+ sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix";
};
- # whois is needed
- propagatedBuildInputs = [ inetutils ];
+ propagatedBuildInputs = [
+ # whois is needed
+ inetutils
+ ];
# tests require network access
doCheck = false;
- pythonImportsCheck = [ "whois" ];
+
+ pythonImportsCheck = [
+ "whois"
+ ];
meta = with lib; {
description = "Python module/library for retrieving WHOIS information";
diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index c916f8d7ec2a..ca339b7a4438 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
- version = "6.0.2";
+ version = "6.0.3";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
- sha256 = "sha256-P8mUkAO3usFCE+E9cna2x1iA2uyHVPX9FHDpX+kTFWQ=";
+ sha256 = "1qvg3bwqzqxlzlixz2di3si7siy0ismq93wd57r8cqmxl54gva6h";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix
index cfb72680fa8b..edb4761af3a8 100644
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/pkgs/development/python-modules/xlib/default.nix
@@ -7,30 +7,39 @@
, python
, mock
, nose
+, pytestCheckHook
, util-linux
}:
buildPythonPackage rec {
pname = "xlib";
- version = "0.29";
+ version = "0.31";
src = fetchFromGitHub {
owner = "python-xlib";
repo = "python-xlib";
rev = version;
- sha256 = "sha256-zOG1QzRa5uN36Ngv8i5s3mq+VIoRzxFj5ltUbKdonJ0=";
+ sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06";
};
- checkPhase = ''
- ${python.interpreter} runtests.py
- '';
-
- checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
nativeBuildInputs = [ setuptools-scm ];
buildInputs = [ xorg.libX11 ];
propagatedBuildInputs = [ six ];
doCheck = !stdenv.isDarwin;
+ checkInputs = [
+ pytestCheckHook
+ mock
+ nose
+ util-linux
+ xorg.xauth
+ xorg.xorgserver
+ ];
+
+ disabledTestPaths = [
+ # requires x session
+ "test/test_xlib_display.py"
+ ];
meta = with lib; {
description = "Fully functional X client library for Python programs";
diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix
index fec15464bd9d..37fedb46d8f0 100644
--- a/pkgs/development/python-modules/yangson/default.nix
+++ b/pkgs/development/python-modules/yangson/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "yangson";
- version = "1.4.10";
+ version = "1.4.12";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-R7ZcG4FStESPDWnFD6WIDD8sugvil9ybVK0J2qQC+zU=";
+ sha256 = "sha256-Dx7jxhO3aGCT1Mq6QDsvZLDcC7EY3dX2ltM0tLxSW8Y=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index db27afcfe6c4..eb7b3bb45e04 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "yfinance";
- version = "0.1.68";
+ version = "0.1.69";
src = fetchFromGitHub {
owner = "ranaroussi";
repo = pname;
rev = version;
- sha256 = "sha256-ubOC56DUViClARzMSRtDFrtxhilmVkhKMx9SxLbYFiA=";
+ sha256 = "1077p01982wgbl8v74f8mqca0y6hmh6qr3gg7m3f1a30lgpljms3";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index 0ff3212f48ca..91c58192b8a2 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "yowsup";
- version = "3.2.3";
+ version = "3.3.0";
# The Python 2.x support of this package is incompatible with `six==1.11`:
# https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
@@ -14,7 +14,7 @@ buildPythonPackage rec {
owner = "tgalal";
repo = "yowsup";
rev = "v${version}";
- sha256 = "0wb8yl685nr1i3vx89hwan5m6a482x8g48f5ksvdlph538p720pm";
+ sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index 3862a8e757d1..c2e707347b33 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -5,12 +5,16 @@
, pathpy
, pytestCheckHook
, setuptools-scm
+, pythonAtLeast
}:
buildPythonPackage rec {
pname = "zetup";
version = "0.2.64";
+ # https://github.com/zimmermanncode/zetup/issues/4
+ disabled = pythonAtLeast "3.10";
+
src = fetchPypi {
inherit pname version;
sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d";
diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix
index 338dd93150b3..d350e2040891 100644
--- a/pkgs/development/python-modules/zimports/default.nix
+++ b/pkgs/development/python-modules/zimports/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "zimports";
- version = "0.2.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "sqlalchemyorg";
repo = "zimports";
- rev = version;
- sha256 = "0a5axflkk0wv0rdnrh8l2rgj8gh2pfkg5lrvr8x4yxxiifawrafc";
+ rev = "v${version}";
+ sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix
index dc30128c9ead..0f64df2a56ac 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/pkgs/development/python-modules/zipp/default.nix
@@ -1,26 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
-, setuptools-scm
, more-itertools
+, pythonOlder
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "zipp";
- version = "3.6.0";
+ version = "3.7.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832";
+ sha256 = "9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d";
};
- nativeBuildInputs = [ setuptools-scm ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
- propagatedBuildInputs = [ more-itertools ];
+ propagatedBuildInputs = [
+ more-itertools
+ ];
# Prevent infinite recursion with pytest
doCheck = false;
+ pythonImportsCheck = [
+ "zipp"
+ ];
+
meta = with lib; {
description = "Pathlib-compatible object wrapper for zip files";
homepage = "https://github.com/jaraco/zipp";
diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix
index 0b5d3103b64d..e1cba0ebc02b 100644
--- a/pkgs/development/python-modules/zope-deferredimport/default.nix
+++ b/pkgs/development/python-modules/zope-deferredimport/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "zope-deferredimport";
- version = "4.3.1";
+ version = "4.4";
src = fetchPypi {
pname = "zope.deferredimport";
inherit version;
- sha256 = "57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1";
+ sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add";
};
propagatedBuildInputs = [ zope_proxy ];
diff --git a/pkgs/development/python2-modules/coverage/default.nix b/pkgs/development/python2-modules/coverage/default.nix
new file mode 100644
index 000000000000..f93d32d392f7
--- /dev/null
+++ b/pkgs/development/python2-modules/coverage/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+}:
+
+buildPythonPackage rec {
+ pname = "coverage";
+ version = "5.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c";
+ };
+
+ # No tests in archive
+ doCheck = false;
+ checkInputs = [ mock ];
+
+ meta = {
+ description = "Code coverage measurement for python";
+ homepage = "https://coverage.readthedocs.io/";
+ license = lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python2-modules/pyparsing/default.nix b/pkgs/development/python2-modules/pyparsing/default.nix
new file mode 100644
index 000000000000..d51032a154af
--- /dev/null
+++ b/pkgs/development/python2-modules/pyparsing/default.nix
@@ -0,0 +1,45 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+
+# since this is a dependency of pytest, we need to avoid
+# circular dependencies
+, jinja2
+, railroad-diagrams
+}:
+
+let
+ pyparsing = buildPythonPackage rec {
+ pname = "pyparsing";
+ version = "2.4.7";
+
+ src = fetchFromGitHub {
+ owner = "pyparsing";
+ repo = pname;
+ rev = "pyparsing_${version}";
+ sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h";
+ };
+
+ # circular dependencies if enabled by default
+ doCheck = false;
+ checkInputs = [
+ jinja2
+ railroad-diagrams
+ ];
+
+ checkPhase = ''
+ python -m unittest
+ '';
+
+ passthru.tests = {
+ check = pyparsing.overridePythonAttrs (_: { doCheck = true; });
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/pyparsing/pyparsing";
+ description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
+ license = licenses.mit;
+ };
+ };
+in
+ pyparsing
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index b244143ba305..98b492a9b92d 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -22,13 +22,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
- version = "2.0.812";
+ version = "2.0.820";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- hash = "sha256-dCGcg0v83/KJGCvq2jQSemaHJb5wvluN6U73dRer6gY=";
+ hash = "sha256-qvYg4tXq9RTYj+pbxg0fZRkTGP8/pk22K9wqMNxVHTo=";
};
nativeBuildInputs = with py.pkgs; [
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 5f0c7bffe94f..62026d527810 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -1,46 +1,42 @@
-{ stdenv, lib, fetchurl, makeWrapper, bison, gcc
-, withISpin ? true, tk, swarm, graphviz }:
+{ stdenv, lib, fetchFromGitHub, makeWrapper, bison, gcc, tk, swarm, graphviz }:
let
- binPath = lib.makeBinPath [ gcc ];
- ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ];
+ binPath = lib.makeBinPath [ gcc graphviz tk swarm ];
+in
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "spin";
- version = "6.4.9";
- url-version = lib.replaceChars ["."] [""] version;
+ version = "6.5.2";
- src = fetchurl {
- # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
- # Dropbox mirror from developers:
- # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa
- # (note that this URL doesn't work aross versions and hash should come from official site)
- url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AABtxFePMJmPxsxSvU5cpxh8a/spin${url-version}.tar.gz?raw=1";
- sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll";
+ src = fetchFromGitHub {
+ owner = "nimble-code";
+ repo = "Spin";
+ rev = "version-${version}";
+ sha256 = "sha256-drvQXfDZCZRycBZt/VNngy8zs4XVJg+d1b4dQXVcyFU=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bison ];
- sourceRoot = "Spin/Src${version}";
+ sourceRoot = "source/Src";
- installPhase = ''
- install -Dm644 ../Man/spin.1 $out/share/man/man1/spin.1
+ preBuild = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/man/man1
+ '';
- install -Dm755 spin $out/bin/spin
- wrapProgram $out/bin/spin \
- --prefix PATH : ${binPath}
- '' + lib.optionalString withISpin ''
- install -Dm755 ../iSpin/ispin.tcl $out/bin/ispin
- wrapProgram $out/bin/ispin \
- --prefix PATH ':' "$out/bin:${ibinPath}"
+ enableParallelBuilding = true;
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ postInstall = ''
+ wrapProgram $out/bin/spin --prefix PATH : ${binPath}
'';
meta = with lib; {
description = "Formal verification tool for distributed software systems";
homepage = "https://spinroot.com/";
- license = licenses.free;
- platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ pSub ];
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ pSub siraben ];
};
}
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 0a001ca50cd5..c6e9ca39128e 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-RoXk/wzizlND+WuFy5ZFfryKC9vS31b6SgZH7dPt3Ds=";
+ sha256 = "sha256-pJyITEIngSWTDGfCcm8Z6YD6Pkbum0Vk71hqWk+CnUc=";
};
goPackagePath = "github.com/aquasecurity/tfsec";
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 444bc39bddd0..0bbe2056be54 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -44,11 +44,12 @@ python3.pkgs.buildPythonApplication rec {
--replace "dateparser~=1.0" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "Flask~=1.1.2" "Flask~=2.0" \
- --replace "PyYAML~=5.3" "PyYAML" \
+ --replace "PyYAML~=5.3" "PyYAML #" \
--replace "regex==" "regex #" \
--replace "requests==" "requests #" \
--replace "typing_extensions==" "typing-extensions #" \
- --replace "tzlocal==3.0" "tzlocal" \
+ --replace "tzlocal==3.0" "tzlocal #" \
+ --replace "tomlkit==0.7.2" "tomlkit #" \
--replace "watchdog==" "watchdog #"
'';
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 5c57776a918a..47abc7ec767b 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI";
- version = "3.22.1";
+ version = "3.22.2";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
- sha256 = "sha256-DpmCKVSdez82hwPSDiSOfuH4U5ENQnBKqHkYwhPqgsA=";
+ sha256 = "sha256-PBxHi5ZQsQfUUsW9VFxy4vrU43wJuJoZhLmi9G32rO0=";
};
patches = [
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 04ab489da1cc..ec3f4de5e11e 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
- version = "1.23.1";
+ version = "1.24.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-vAuUA51E1pufn3YvNe4yfqJHXo14iUEA5MzP3/ah+8I=";
+ sha256 = "sha256-Dl1ZTYzwZ3tl5k9uPnnKHObmTP6Xsw0P1LdPqCfd/d0=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix
new file mode 100644
index 000000000000..563002e9fcb9
--- /dev/null
+++ b/pkgs/development/tools/jless/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "jless";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "PaulJuliusMartinez";
+ repo = "jless";
+ rev = "v${version}";
+ sha256 = "sha256-gBqyo/N/qF6HCTUrSKNVLiL1fc/JTfip1kNpNCBzRT8=";
+ };
+
+ cargoSha256 = "sha256-PbX61RVbrI2kTuyXK+LhQdJDvNo3KjIQH5eBbL6iUBM=";
+
+ meta = with lib; {
+ description = "A command-line pager for JSON data";
+ homepage = "https://github.com/PaulJuliusMartinez/jless";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jfchevrette ];
+ };
+}
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index 0e92d373c0b3..e8136be0eb40 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cgdb";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchurl {
url = "https://cgdb.me/files/${pname}-${version}.tar.gz";
- sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv";
+ sha256 = "sha256-DTi1JNN3JXsQa61thW2K4zBBQOHuJAhTQ+bd8bZYEfE=";
};
buildInputs = [ ncurses readline flex texinfo ];
diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix
index b39ab68f06c0..5a532d79f2bd 100644
--- a/pkgs/development/tools/misc/reviewdog/default.nix
+++ b/pkgs/development/tools/misc/reviewdog/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "reviewdog";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g=";
+ sha256 = "sha256-IBAJePrqliriOkZRWLAU7hllpGr4DVs8rzD2yyOXZzM=";
};
- vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE=";
+ vendorSha256 = "sha256-6TBurIWct6k4X+0lZ9FYgTc+DQgTpEIS7HUr0V7n++I=";
doCheck = false;
diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/development/tools/misc/spruce/default.nix
index 16fd6cde043d..7c10a6ee0ca7 100644
--- a/pkgs/development/tools/misc/spruce/default.nix
+++ b/pkgs/development/tools/misc/spruce/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "spruce";
- version = "1.29.0";
+ version = "unstable-2022-02-10";
src = fetchFromGitHub {
owner = "geofffranks";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-HjJWiBYd1YFDZ+XOFcU2Df6bmKFBwVQ6YbiZv1IVN3A=";
+ rev = "473931f33fceae90b3f5cfb7616c296343a9559b";
+ sha256 = "sha256-TFyWkoAKmj3KH2pqhVKMtP6QKTtu0s7H5gNP+fotUzg=";
};
deleteVendor = true;
- vendorSha256 = "sha256-67PGSW3wV8i3mAt3rCuWbFmeOe+QhHXn2rTUmeN6YMA=";
+ vendorSha256 = "sha256-VeC5c/BgcxK3Qawb2QOhqtfTIgbQbrQj546zX6yPD+s=";
meta = with lib; {
description = "A BOSH template merge tool";
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 8d8f1e1627aa..b379df09a4b0 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -18,7 +18,7 @@ in
with lib;
stdenv.mkDerivation {
- name = "texinfo-${optionalString interactive "interactive-"}${version}";
+ pname = "texinfo${optionalString interactive "-interactive"}";
inherit version;
src = fetchurl {
diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index 8d088a6d2860..6de56fb47058 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "mold";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0TXk+6hS6TJHwhowYzL8ABw3iyfVwPttJWKQ9RfzMSI=";
+ sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4=";
};
buildInputs = [ zlib openssl ];
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 497a8ce91c1d..e7abf32eae5f 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -36,15 +36,21 @@ stdenv.mkDerivation rec {
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
fi
}
- createOcamlDestDir () {
+ exportOcamlDestDir () {
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
+ }
+ createOcamlDestDir () {
if test -n "''${createFindlibDestdir-}"; then
mkdir -p $OCAMLFIND_DESTDIR
fi
}
+ # run for every buildInput
addEnvHooks "$targetOffset" addOCamlPath
- preConfigureHooks+=(createOcamlDestDir)
+ # run before installPhase, even without buildInputs, and not in nix-shell
+ preInstallHooks+=(createOcamlDestDir)
+ # run even in nix-shell, and even without buildInputs
+ addEnvHooks "$hostOffset" exportOcamlDestDir
'';
meta = {
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index c3b09b71d173..41ec653a409b 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -2,18 +2,19 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
+, nix-update-script
, python3
}:
stdenv.mkDerivation rec {
pname = "re2c";
- version = "2.2";
+ version = "3.0";
src = fetchFromGitHub {
owner = "skvadrik";
repo = "re2c";
rev = version;
- sha256 = "0snfxk1cf2f4dy4hcxd1fx1grav3di0qjgqqn97k85zsf9f6ys78";
+ sha256 = "sha256-ovwmltu97fzNQT0oZHefrAo4yV9HV1NwcY4PTSM5Bro=";
};
nativeBuildInputs = [
@@ -28,6 +29,12 @@ stdenv.mkDerivation rec {
patchShebangs run_tests.py
'';
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
+
meta = with lib; {
description = "Tool for writing very fast and very flexible scanners";
homepage = "https://re2c.org";
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index 61e0ee43fc7a..9e5bce1b0a43 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/uyha/tree-sitter-cmake",
- "rev": "f6616f1e417ee8b62daf251aa1daa5d73781c596",
- "date": "2021-10-13T08:19:43+02:00",
- "path": "/nix/store/p13qh130n5741wdfk2fbmy7ifd1z1zb2-tree-sitter-cmake",
- "sha256": "1b5cc84d0gjm8nb73gdvfjxbk9fjrfkd5aay3b0qvk6gar59pcj6",
+ "rev": "5020572408a386d5d2dfac3516584f5edda7a49b",
+ "date": "2022-01-26T22:53:15+01:00",
+ "path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake",
+ "sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
index cefe88d8be12..ed62f80e237d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/thehamsta/tree-sitter-commonlisp",
- "rev": "4fd115d3bb7046cd094f21bfe5766c302dbf64cd",
- "date": "2021-12-06T20:34:14+01:00",
- "path": "/nix/store/vmyfmgyhnx0ipi16d1w7sxsdkprybzk7-tree-sitter-commonlisp",
- "sha256": "1kmxmx93f34lba5g7kqa5fcijfak9zc9qydbid9dcqxw6kf65ncg",
+ "rev": "c7e814975ab0d0d04333d1f32391c41180c58919",
+ "date": "2022-01-28T21:33:11+01:00",
+ "path": "/nix/store/1696bj1f92y8vqfk71cha8bzk9cx9rls-tree-sitter-commonlisp",
+ "sha256": "1hq3pwrp8509scgn983g0mi8pjy2q21pms30xlc3q7yyjxvpsw7b",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
index 3618413500e1..19129d053a05 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/elm-tooling/tree-sitter-elm",
- "rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd",
- "date": "2021-12-27T23:25:02+01:00",
- "path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm",
- "sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky",
+ "rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea",
+ "date": "2022-02-04T13:10:25+01:00",
+ "path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm",
+ "sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
index b6ff0d8a3260..654a89b5979b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/connorlay/tree-sitter-heex",
- "rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44",
- "date": "2022-01-23T20:01:08-08:00",
- "path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex",
- "sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k",
+ "rev": "592e22292a367312c35e13de7fdb888f029981d6",
+ "date": "2022-01-30T14:04:04-08:00",
+ "path": "/nix/store/21n6sqyvkfd0q5ass9nj2wgicm9ljmgv-tree-sitter-heex",
+ "sha256": "1k4nhlbbn7lqrjmkz8rr81rsrfkl9qfwm9q7qd2b18ygzr52payh",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
index bfa5df37337e..5cf20f27968f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/latex-lsp/tree-sitter-latex",
- "rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2",
- "date": "2022-01-11T19:20:05+01:00",
- "path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex",
- "sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n",
+ "rev": "323b609de40b7729073482a3c59de76cfba7744f",
+ "date": "2022-02-08T21:23:53+01:00",
+ "path": "/nix/store/f6kvr0x41rbb64s36ii6bj30fqaallz4-tree-sitter-latex",
+ "sha256": "1qsw5wcqs65ip0qq17vq6bf2snnpvw61iq2ahgwl9842ir15hrbr",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index 189301c7293e..1743d2252cd6 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/nvim-neorg/tree-sitter-norg",
- "rev": "c4be6addec0a8ada234684ced6c928189fd399af",
- "date": "2022-01-22T17:12:52+01:00",
- "path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg",
- "sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc",
+ "rev": "b7f879eaf9f20852f6b670439154b0128fbb6558",
+ "date": "2022-02-08T12:24:02+01:00",
+ "path": "/nix/store/q02py98zm9cmalzc5a0yqw8lg73ybx9g-tree-sitter-norg",
+ "sha256": "07hm5sysb25ivlz52ijnbka02hlqksha259w7v03awap85i9ydk6",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
index 23df3b743c7e..67e75cd60ee2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/milisims/tree-sitter-org",
- "rev": "f110024d539e676f25b72b7c80b0fd43c34264ef",
- "date": "2021-11-28T23:04:31-05:00",
- "path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org",
- "sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc",
+ "rev": "1c3eb533a9cf6800067357b59e03ac3f91fc3a54",
+ "date": "2022-02-05T14:19:52-05:00",
+ "path": "/nix/store/n51rx6d005iibpvb1bb2d7az1l6p6vlq-tree-sitter-org",
+ "sha256": "06xkhhdlkikvxadp7wnk8riz51mjq9ks1jchdy9x3fmq6bj72y1p",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index e64e3f6bff36..856d6bbb7e5c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
- "rev": "57f855461aeeca73bd4218754fb26b5ac143f98f",
- "date": "2021-11-19T17:22:11+01:00",
- "path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php",
- "sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc",
+ "rev": "0ce134234214427b6aeb2735e93a307881c6cd6f",
+ "date": "2022-01-31T19:53:17+01:00",
+ "path": "/nix/store/kdddnbbsik9wvnjh1wnbyzzr1x8v64ps-tree-sitter-php",
+ "sha256": "0gg3p1zpwfhf0qz0isnca0zi5zkxs5j5bmjix99dv3rkw911vk17",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 548764811a55..e724e7bbebc4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
- "rev": "24b530ca158d2782ea9046e756057a412e16b52f",
- "date": "2021-11-11T20:37:43-08:00",
- "path": "/nix/store/1fqgxgb3l6wxvsvzaa2f26h5ywiyxz5h-tree-sitter-python",
- "sha256": "1d8d66v64jwwk73y8q94n80w0f0cs7wjnww49b0sbmpa9d3hsfl6",
+ "rev": "78c4e9b6b2f08e1be23b541ffced47b15e2972ad",
+ "date": "2022-02-07T12:53:14-08:00",
+ "path": "/nix/store/9i5fh21cwa6w2zq9fkcn46207pbk2fzn-tree-sitter-python",
+ "sha256": "09xq6ymwa2ap4432yln5qs0y41iaxbrpp4m07pvydgcmyk3blxvv",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index dc339fe1fd65..f77e92922533 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/r-lib/tree-sitter-r",
- "rev": "d9868735e401e4870a3d4422790b585fea3faec8",
- "date": "2022-01-10T10:12:40-05:00",
- "path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r",
- "sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0",
+ "rev": "c19e54de252d5573cc2a762a030957074526fe99",
+ "date": "2022-01-27T09:41:27-05:00",
+ "path": "/nix/store/b2h3khs1x0j4j2fvs2sbkx1dp3d8fx4g-tree-sitter-r",
+ "sha256": "1zan8dhjpxrn7vy7mvbc85hcdd5lls3vzpk6nchvn3j0i1ach85h",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 1479f09e0673..87cc40f83b89 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
- "rev": "eeb0702ebdac504b97196577b1dac43c80913d7b",
- "date": "2022-01-10T13:05:56-08:00",
- "path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust",
- "sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq",
+ "rev": "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68",
+ "date": "2022-02-04T13:11:35-08:00",
+ "path": "/nix/store/i1f2zyrqghy98pl7dfnvcpbs3jsnmhay-tree-sitter-rust",
+ "sha256": "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
index 03644c839c3c..0b2637a14389 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/serenadeai/tree-sitter-scss",
- "rev": "f3174d3d131eb776f86dfa3d90fe6f7325c0ad9a",
- "date": "2021-11-08T17:21:33-08:00",
- "path": "/nix/store/qpmqd6a3rnrp451b5jjmqqwark276smj-tree-sitter-scss",
- "sha256": "0c8mx5fxcfn8wn361i7pnr3xga7vm2jjj99ilkqljir71nl6bm11",
+ "rev": "c478c6868648eff49eb04a4df90d703dc45b312a",
+ "date": "2022-02-03T21:48:21+00:00",
+ "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss",
+ "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
index 7dcf59de2ff0..24f577629497 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
- "rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd",
- "date": "2022-01-14T01:11:12+01:00",
- "path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider",
- "sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3",
+ "rev": "0f0e5b5a96dd3e048a9c3db648ed969c44068bff",
+ "date": "2022-02-01T13:46:31+01:00",
+ "path": "/nix/store/5rzm6vnqvpwxwakrjyy93hg0glfvcx93-tree-sitter-supercollider",
+ "sha256": "0nxl43j7ddsddqcq56p921h1r5jkx8v49zxjzr6mcj6y1ljzndm2",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index 86e9a86bbcc0..2ffc311fd943 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
- "rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7",
- "date": "2022-01-23T09:32:54-05:00",
- "path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus",
- "sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv",
+ "rev": "dde405e5128c3c47ab8aa014d21b6e5296ca450f",
+ "date": "2022-02-03T12:27:54-05:00",
+ "path": "/nix/store/vwmr9wd4agmym5ryrchl470qa46j8ymr-tree-sitter-tlaplus",
+ "sha256": "06g5pbx4rydfryfxfqjq37akhqn2465xwh90r5yc5rdv0kppvbhq",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
index bb57181f00f6..12322fe82b40 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/vigoux/tree-sitter-viml",
- "rev": "274b004d226a6686546ef83231f0f836b91700ae",
- "date": "2022-01-21T14:12:20+01:00",
- "path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml",
- "sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c",
+ "rev": "bc573ef552adf8bed9e36eb687a0cccf43158634",
+ "date": "2022-01-24T16:13:56+01:00",
+ "path": "/nix/store/2i9n2fvjk0ymxv32ziq5z9ykv95svi7d-tree-sitter-viml",
+ "sha256": "0ckx9jh9fqfw5x9yb0sljczb0xsgxs8j6v2qbqywh5z6fcqx8sjc",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 166154f7481a..246574895e3c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -376,7 +376,7 @@ let
if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then
echo "rate limited" >&2
fi
- release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name')
+ release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name')"
# github sometimes returns an empty list even tough there are releases
if [ "$release" = "null" ]; then
echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2
diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix
index aec27c588a90..32ecbf9b340a 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-msrv";
- version = "0.13.0";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "foresterre";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-zIUbPmSlobSC3iJ0ddto40Sa/1xzCYG6eaTjMuUnXNU=";
+ sha256 = "sha256-rKkU49sqVArp/iCfcG78ieoEbyZoqB1owTwLfl09DSM=";
};
- cargoSha256 = "sha256-GKU0ootG4fXUGErPplERMVjEBop/0+sfQCYpQwPPcXA=";
+ cargoSha256 = "sha256-aA4l7kyVnu416LcHddJqrEpi8WS0AImbROZG+kBy5tk=";
passthru = {
updateScript = nix-update-script {
diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix
index 021ba8c7f93b..8087148c169d 100644
--- a/pkgs/development/tools/sentry-cli/default.nix
+++ b/pkgs/development/tools/sentry-cli/default.nix
@@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
- version = "1.72.1";
+ version = "1.72.2";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
- sha256 = "sha256-qFEvDslAjXpIpSanM4iorgTRfKWQPKKzxxwguFUlFZA=";
+ sha256 = "sha256-iaU0+sbssHhenz7QgXI9n5J2P5b0Tbw7fdvekRmjEeY=";
};
doCheck = false;
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "sha256-PRyQWohxlSNRiVj3r7xTxFVWsYL+C50bkhDU4NLaMBo=";
+ cargoSha256 = "sha256-vz0qSKFoM5kRgATshQ8W+yJTtWyQRvHp22t4nsJHqG0=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix
index cb15bdfd3e5b..5d185dd153e0 100644
--- a/pkgs/development/tools/stylua/default.nix
+++ b/pkgs/development/tools/stylua/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "stylua";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "johnnymorganz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-LmmOaxB7UNQQUFBYN5wNZYt9xH5wDrBbtB9QOCb3suQ=";
+ sha256 = "sha256-Nry6P4nwcCmvJ4kdzeGEkaP1fm2LgnAwrINTBFK23tY=";
};
- cargoSha256 = "sha256-Schaiu9XnkEfjY6D8ZT7dtCf8UN58zQ6256xeOWBi5M=";
+ cargoSha256 = "sha256-i5wOGPOe1lDZknrVzZGxC8dUgTGiZJSzLqkxSRt0mQ8=";
buildFeatures = lib.optional lua52Support "lua52"
++ lib.optional luauSupport "luau";
diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix
index ee75f2e081bc..99b51854e7d4 100644
--- a/pkgs/development/tools/sumneko-lua-language-server/default.nix
+++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix
@@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
- version = "2.6.0";
+ version = "2.6.4";
src = fetchFromGitHub {
owner = "sumneko";
repo = "lua-language-server";
rev = version;
- sha256 = "sha256-8Vfk6B85anlUf09cc08hOGujbcVCMqgEJ1PTxX6llrk=";
+ sha256 = "sha256-oUIgEWLcpEZHtL1wvTAezLtz2PecddtwhzbLhGqso/k=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix
index d40eddf12f0e..5b084aaad3ef 100644
--- a/pkgs/development/tools/symfony-cli/default.nix
+++ b/pkgs/development/tools/symfony-cli/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "symfony-cli";
- version = "5.3.0";
+ version = "5.3.3";
vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
- sha256 = "sha256-bZPoHVYso2BEEZO4FXubxOtGCIJyX77Ll0qut5sJjUA=";
+ sha256 = "sha256-qLgcv6vjPiNJZuZzW0mSKxySz0GdNALtyZ6E3fL3B6Y=";
};
# Tests requires network access
diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
index eb08ce7f0dad..6e839617034d 100644
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vultr-cli";
- version = "2.12.0";
+ version = "2.12.1";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mT99flZAAhLSynD/8+fa74Mc3KK8pVs+OOFDYNSBzEE=";
+ sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 5568f8c457ac..2ce704a00b67 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wabt";
- version = "1.0.25";
+ version = "1.0.26";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
- sha256 = "sha256-2go4HR/z96ONisXBGZDSIB5vXtHvRqBMhHOQTBL5G5w=";
+ sha256 = "sha256-xX654awHD7tHRhM6VYmbgsX3/XQDLmAUJ1EpBIQMc3M=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index a6c2b6db9730..fba7d96c1da2 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
- version = "1.19.7";
+ version = "1.19.8";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1Bb4vpmWtSW2E2gr6V+tDsc4P5FJfCLLpzQX2WiVzUg=";
+ sha256 = "sha256-vJjAN7RmB1J4k7p2emfbjJxkpfph6piinmqVTR67HW0=";
};
- cargoSha256 = "sha256-iAlRdUMR+64ngRT4icY6sTFFeRt4aShV/hj8PXJ0kEk=";
+ cargoSha256 = "sha256-dDQvcYnceBPDc+yeePjZ1k4a2ujCSh1hJMYFjPGw/bE=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index ec75f5854b23..6885e9887157 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
- version = "9.3.1";
+ version = "9.4.1";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
- sha256 = "0626i5nxymh9hh9kf1mkky165cynsrkfw402xqmf69pnyzbzn0h7";
+ sha256 = "JoHfXhN5mXJoPwnUf7cKK5FduxqP9bSaGUU8yNfg29Y=";
};
# don't remove runtime deps
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 72615b356222..1e05850884c7 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -19,7 +19,7 @@ let
majorVersion = versions.major version;
minorVersion = versions.minor version;
- baseName = if enableNpm then "nodejs" else "nodejs-slim";
+ pname = if enableNpm then "nodejs" else "nodejs-slim";
useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4";
@@ -43,9 +43,7 @@ let
extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
self = stdenv.mkDerivation {
- inherit version;
-
- name = "${baseName}-${version}";
+ inherit pname version;
src = fetchurl {
url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix
index 347ccd8df63b..6477e3fb37d5 100644
--- a/pkgs/games/alephone/default.nix
+++ b/pkgs/games/alephone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg
+{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg
, libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net
, SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip
, alephone }:
@@ -20,7 +20,7 @@ let
buildInputs = [
boost
curl
- ffmpeg
+ ffmpeg_4
libGLU
libmad
libsndfile
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index d1def3740097..a25111bddfe9 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -116,6 +116,11 @@ buildPythonApplication rec {
url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch";
sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2";
})
+ (fetchpatch {
+ name = "anki-2.1.15-unescape.patch";
+ url = "https://795309.bugs.gentoo.org/attachment.cgi?id=715200";
+ sha256 = "14rz864kdaba4fd1marwkyz9n1jiqnbjy4al8bvwlhpvp0rm1qk6";
+ })
];
# Anki does not use setup.py
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index e5eea7ece628..064e1d623a5f 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "crawl${lib.optionalString tileMode "-tiles"}";
- version = "0.27.1";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = "crawl";
repo = "crawl";
rev = version;
- sha256 = "sha256-fyI7OIzhYXNTjIgJLqApyPMmiG3iof1b5XuGudNanos=";
+ sha256 = "sha256-pVEE3g+NDwpsrakyj4YIk53aE+LCiIaRhOqos4huh9A=";
};
# Patch hard-coded paths and remove force library builds
diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix
index 2093e162f941..3567a5886055 100644
--- a/pkgs/games/flare/default.nix
+++ b/pkgs/games/flare/default.nix
@@ -1,7 +1,7 @@
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:
buildEnv {
- name = "flare-1.13";
+ name = "flare-1.13.04";
paths = [
(callPackage ./engine.nix { inherit Cocoa; })
diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix
index fa409857eab6..9e9215ada1f2 100644
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flare-engine";
- version = "1.13";
+ version = "1.13.04";
src = fetchFromGitHub {
owner = "flareteam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-53JCjVu6vG4js5UryQIccpD8qdS+EfxSyV4v2LOYe+c=";
+ sha256 = "sha256-GPHPYcW0kBDGpZti2kFggNB4RVK/3eQ53M9mJvJuKXM=";
};
patches = [ ./desktop.patch ];
diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix
index 5a3d42379787..791af2645353 100644
--- a/pkgs/games/flare/game.nix
+++ b/pkgs/games/flare/game.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flare-game";
- version = "1.13";
+ version = "1.13.04";
src = fetchFromGitHub {
owner = "flareteam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-zfZTHw8obq5/z9+mCY0LIq9suvyh91ypqpxc3dNxI4o=";
+ sha256 = "sha256-7dEIagioM6OZXG+eNaYls8skHXSqGFXZuNhT0zhTFdY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index f6b9c11ffe39..d8defe6f2e96 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -4,7 +4,7 @@
, SDL2
, cmake
, libepoxy
-, ffmpeg
+, ffmpeg_4
, imagemagick
, libedit
, libelf
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2
libepoxy
- ffmpeg
+ ffmpeg_4
imagemagick
libedit
libelf
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index f0dba9058d10..2c49874e5446 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -6,7 +6,7 @@
, alsa-lib
, AppKit
, fetchFromGitHub
-, ffmpeg
+, ffmpeg_4
, Foundation
, freetype
, gamemode
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
lib.optional stdenv.isLinux wayland ++
lib.optional (runtimeLibs != [ ]) makeWrapper;
- buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++
+ buildInputs = [ ffmpeg_4 freetype libxml2 libGLU libGL python3 SDL2 which ] ++
lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++
lib.optional withVulkan vulkan-loader ++
lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++
diff --git a/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch b/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch
deleted file mode 100644
index f6316ae972fd..000000000000
--- a/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cb13c20332526a4db99e7fd0818b9a75829affad Mon Sep 17 00:00:00 2001
-From: Zane van Iperen
-Date: Sun, 7 Nov 2021 15:36:02 +1000
-Subject: [PATCH] fix build with ffmepg 4
-
----
- libmedia/ffmpeg/MediaHandlerFfmpeg.cpp | 2 +-
- libmedia/ffmpeg/MediaParserFfmpeg.cpp | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
-index 127aaaa..216d96b 100644
---- a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
-+++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
-@@ -149,7 +149,7 @@ MediaHandlerFfmpeg::cameraNames(std::vector& /*names*/) const
- size_t
- MediaHandlerFfmpeg::getInputPaddingSize() const
- {
-- return FF_INPUT_BUFFER_PADDING_SIZE;
-+ return AV_INPUT_BUFFER_PADDING_SIZE;
- }
-
- } // gnash.media.ffmpeg namespace
-diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
-index 9ceb8b0..a27ca56 100644
---- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
-+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
-@@ -64,7 +64,7 @@ AVInputFormat*
- MediaParserFfmpeg::probeStream()
- {
- const size_t probeSize = 4096;
-- const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE;
-+ const size_t bufSize = probeSize + AV_INPUT_BUFFER_PADDING_SIZE;
-
- std::unique_ptr buffer(new std::uint8_t[bufSize]);
-
-@@ -173,7 +173,7 @@ MediaParserFfmpeg::parseVideoFrame(AVPacket& packet)
-
- // TODO: We might avoid the copy as a whole by making EncodedVideoFrame
- // virtual.
-- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
-+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE;
- std::uint8_t* data = new std::uint8_t[allocSize];
- std::copy(packet.data, packet.data+packet.size, data);
- std::unique_ptr frame(new EncodedVideoFrame(data, packet.size, 0, timestamp));
-@@ -221,7 +221,7 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet)
-
- // TODO: We might avoid the copy as a whole by making EncodedAudioFrame
- // virtual.
-- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE;
-+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE;
- std::uint8_t* data = new std::uint8_t[allocSize];
- std::copy(packet.data, packet.data+packet.size, data);
-
---
-2.31.1
-
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
deleted file mode 100644
index fc7148b40489..000000000000
--- a/pkgs/misc/gnash/default.nix
+++ /dev/null
@@ -1,132 +0,0 @@
-{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook
-, pkg-config, libtool, boost, SDL
-, glib, pango, gettext, curl, xorg
-, libpng, libjpeg, giflib, speex, atk
-
-# renderers
-, enableAGG ? true, agg ? null
-, enableCairo ? false, cairo ? null
-, enableOpenGL ? false
-, libGLU ? null
-, libGL ? null
-
-# GUI toolkits
-, enableGTK ? true, gtk2 ? null, gnome2 ? null
-, enableSDL ? false
-, enableQt ? false, qt4 ? null
-
-# media
-, enableFFmpeg ? true, ffmpeg ? null
-
-# misc
-, enableJemalloc ? true, jemalloc ? null
-, enableHwAccel ? true
-, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null
-}:
-
-with lib;
-
-let
- available = x: x != null;
-
- sound =
- if enableFFmpeg then "ffmpeg" else "none";
-
- renderers = []
- ++ optional enableAGG "agg"
- ++ optional enableCairo "cairo"
- ++ optional enableOpenGL "opengl";
-
- toolkits = []
- ++ optional enableGTK "gtk"
- ++ optional enableSDL "sdl"
- ++ optional enableQt "qt4";
-
-in
-
-# renderers
-assert enableAGG -> available agg;
-assert enableCairo -> available cairo;
-assert enableOpenGL -> all available [ libGLU libGL ];
-
-# GUI toolkits
-assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ];
-assert enableSDL -> available SDL;
-assert enableQt -> available qt4;
-
-# media libraries
-assert enableFFmpeg -> available ffmpeg ;
-
-# misc
-assert enableJemalloc -> available jemalloc;
-assert enableHwAccel -> all available [ libGLU libGL ];
-assert enablePlugins -> all available [ xulrunner npapi_sdk ];
-
-assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled";
-assert length renderers == 0 -> throw "at least one renderer must be enabled";
-
-
-stdenv.mkDerivation {
- pname = "gnash";
- version = "0.8.11-2019-30-01";
-
- src = fetchgit {
- url = "git://git.sv.gnu.org/gnash.git";
- rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4";
- sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry";
- };
-
- postPatch = ''
- sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c
- '';
-
- nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
- buildInputs = [
- glib gettext boost curl SDL speex
- xorg.libXmu xorg.libSM xorg.libXt
- libpng libjpeg giflib pango atk
- ] ++ optional enableAGG agg
- ++ optional enableCairo cairo
- ++ optional enableQt qt4
- ++ optional enableFFmpeg ffmpeg
- ++ optional enableJemalloc jemalloc
- ++ optional enableHwAccel [ libGL libGLU ]
- ++ optionals enableOpenGL [ libGL libGLU ]
- ++ optionals enablePlugins [ xulrunner npapi_sdk ]
- ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ];
-
- patches = [
- (fetchpatch { # fix compilation due to bad detection of libgif version: https://savannah.gnu.org/patch/index.php?9873
- url = "https://savannah.gnu.org/patch/download.php?file_id=47859";
- sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y";
- })
-
- # Fix build with modern Pango
- # https://savannah.gnu.org/bugs/index.php?57759
- (fetchpatch {
- url = "https://savannah.gnu.org/file/0001-Do-not-depend-on-pangox.patch?file_id=48366";
- sha256 = "02x7sl5zwd1ld2n4b6bp16c5gk91qsap0spfbb5iwpglq3galv2l";
- })
-
- ./0001-fix-build-with-ffmepg-4.patch
- ];
-
- configureFlags = with lib; [
- "--with-boost-incl=${boost.dev}/include"
- "--with-boost-lib=${boost.out}/lib"
- "--enable-renderer=${concatStringsSep "," renderers}"
- "--enable-gui=${concatStringsSep "," toolkits}"
- "--enable-media=${sound}"
- "--with-npapi-install=prefix"
- (enableFeature enablePlugins "plugins")
- (enableFeature enableJemalloc "jemalloc")
- (optionalString enableHwAccel "--enable-device=egl")
- ];
-
- meta = {
- homepage = "https://savannah.gnu.org/projects/gnash";
- description = "A flash (SWF) player and browser plugin";
- license = licenses.gpl3;
- maintainers = with maintainers; [ rnhmjoj ];
- };
-}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 414ffc47805a..210aa3e817cb 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2022-02-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "82a3e444b299cff3127809b02ea63c819486f285";
- sha256 = "0y18dpf5c5xria1wxxgsqf0wb5cmkm1k3ydyk885mcyjkzy9s8yk";
+ rev = "47470eddc277e0a141e6e36a1e2a19045e051d1c";
+ sha256 = "1wrhi9gwr5wjl7jdvqvldrl4480qcx6ry9gkl41dhiz643g28pvk";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -425,12 +425,12 @@ final: prev:
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
- version = "2022-01-28";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "jlanzarotta";
repo = "bufexplorer";
- rev = "b3a24722bea9029b4c37eb0547b87152d514c66f";
- sha256 = "14114786fkqjzpl3aqsk2lmfnlhxzdkkanv6ls6q0cwvpqdng6wc";
+ rev = "4b1d3adca7e968ebc619cf2f6f3e197ef78c8342";
+ sha256 = "0imyzav898hzx4d669rxx7qyac6b8csp04am2j85rr31rywylpn0";
};
meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
};
@@ -509,12 +509,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2022-02-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "aa250cb8dbe80792e32d45d1bd4d63850652f771";
- sha256 = "1ykj74ysla1vqq6qjdb593w7r26rapffv2jav6kipigna71bg6j8";
+ rev = "95920369e18ea64bb5e1e5f1a3161c822681f325";
+ sha256 = "1jd0vqmlwm9x28bdflbfcg3xgsff0mh011cwi1sq30llwja1jhf2";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -929,12 +929,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
- version = "2022-02-07";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "86fa3b18144aaeaa06bf5a7150c8d676ef1acca3";
- sha256 = "0ppjxkh8nqhrypl46rfs4bgfmci9idbc589js6i2waqxzha7a9jf";
+ rev = "6116a010e18b7adcca024d95891da9af4e0dcd27";
+ sha256 = "06sc3rr4dxk1j6glb6vyxkw8k9m90g7gd1zdgsj5pw7mxfk9xbik";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -1194,12 +1194,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2022-02-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "47988a87e9dc594b590f820250784ebc2f7cd4fb";
- sha256 = "0qsdwvr518vlm3w5xhayh7ahdnazxh7xyvjcmljby3scdcdsfjfn";
+ rev = "81aea6abdf8467b79fd8fe506d28f60391d30ac4";
+ sha256 = "1fjjkwz9q91xfyph19hix9610s7g331mwq15wmpcr86vrmjvjbbj";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -1314,12 +1314,12 @@ final: prev:
ctrlp-vim = buildVimPluginFrom2Nix {
pname = "ctrlp.vim";
- version = "2022-01-14";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
- rev = "ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8";
- sha256 = "1336bk2w4ll1vq6vwd0pq77021i13hcrm3mqzynznvhxwwxrk4dy";
+ rev = "d5b092036bc651912474f64277913be8502f8f09";
+ sha256 = "12nmcam301h69181hznsh19p9sl42srp98dfa56ghy4iyrcg2d34";
};
meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
};
@@ -1796,12 +1796,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2022-02-04";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "4078d2bb859fbb907880dca5f2bcb4815b30351d";
- sha256 = "036lnw87dw2rrx2r2nb4yplwrhy5dhdi44crbmfrpq34iqw97yzr";
+ rev = "40ea50a854175d65f4ce9ea84fff39ba572e3f67";
+ sha256 = "0wwp0hdvlri3kbq2b6glckyrbs4dbqynh25hgj3j77pc4zkjmjla";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -1966,12 +1966,12 @@ final: prev:
fern-vim = buildVimPluginFrom2Nix {
pname = "fern.vim";
- version = "2022-01-11";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "b6204ec4e04732d7b4ba73a3e4af48cba3576d67";
- sha256 = "0ndddww8ciwil7bpn77yahb7fcn5i59sq91syqy3qr0wwmfc7mwc";
+ rev = "d415fcee2634b6c9bb4fad223c4e909498c6dcb8";
+ sha256 = "0vs8nhhmpnp5jnqkmn5dz3mkhp894hyhv0v32j9qqsvdrllzsyjz";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1990,12 +1990,12 @@ final: prev:
fidget-nvim = buildVimPluginFrom2Nix {
pname = "fidget.nvim";
- version = "2022-02-06";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "j-hui";
repo = "fidget.nvim";
- rev = "a4ff3c978c6b4740143223bf090a7acf7444e2f8";
- sha256 = "0v8vnr10hvxg4izniaaj3awf8c30qbcjs4wzrd25lbx6didvmx56";
+ rev = "2a69ee6d17cd264eb10b33170df4cfce4cc4f4f3";
+ sha256 = "0l7ir0fky6czmjkkhd13di4x39jhy70i0s0wjiiyqn9cdfm0xw14";
};
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
};
@@ -2075,12 +2075,12 @@ final: prev:
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
- version = "2021-11-03";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
- rev = "0cdce2da8762ee01ee7d8df047b6e569d58c1ba3";
- sha256 = "1169xj5k04l7gfhxqa4afq9khf6yv5bcihir21sgzpym4z69axh7";
+ rev = "80a14fae599dfd200c805c345a7515266abf3438";
+ sha256 = "1d42mbxhry3scycykxh381xdykm225sg5v02f9lfv9r2r3ay81jf";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@@ -2483,12 +2483,12 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material";
- version = "2022-02-04";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "gruvbox-material";
- rev = "2a4f998b65fe39f6a762a7d261249a93c848dac9";
- sha256 = "09q7dh46dbajdd5hfc88jdfwxsv7c8zm1hmm3wjfjfwb5bln06dq";
+ rev = "591ca7fa71449b0e6ffe27f4525c3ceecc0b5684";
+ sha256 = "1i5yq5lj4ws8j3v4pc459ls69fgcgfh8a4fr98gnj4z650nprkpg";
};
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
};
@@ -2916,12 +2916,12 @@ final: prev:
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2021-12-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "e4972997fb5aee1c180e9840586a09553865cc20";
- sha256 = "11v9fhd7i9si5psnsrvdgrih64rgjjy7ypjlfz9ys74rcryfyy5x";
+ rev = "a630e12de13db03313b88d6983cbbb81398eadcd";
+ sha256 = "08rlj48cw7c9cslrkpiw63fic5yw8vvls7ifcw48m1bhpibxfmnh";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@@ -3192,12 +3192,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed.nvim";
- version = "2022-02-07";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
- rev = "0c01dc2e2cad214614352d372ed9d7438240488f";
- sha256 = "05ybrag1gkhapr1yvs7zz2qfqibnpf2h4lg3x6f0ag9g0khhh96c";
+ rev = "b04fc4e129512ce5ccd15acfe8388a898daa0a2a";
+ sha256 = "0a7bz8v0lh8myj39vk553gkglmk83smqc3nylfabqyxkij1gmdqx";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -3359,12 +3359,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature.nvim";
- version = "2022-01-30";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "30c7cf023782f50cfa8f65d0508163d6ebfd2442";
- sha256 = "1qnzy258giqxkhmbvfv8fph5k3f2r313mj0rqsans2v8bq6ay6g0";
+ rev = "42eb06b5903dc212acb03f276e6e3fd24f92593c";
+ sha256 = "0mh2glx9fmf56znpnxn8y8n185pdl8hxiy00pymc5r2g2q8gjrlb";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -3431,12 +3431,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2022-02-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "132eff7cb39d9aeeceb80c816ccbda5bca2d60bb";
- sha256 = "1day60kqq1fgdwcvwm3nx9y2ibkv33c5s75ndv22ajk8cmdrrzdw";
+ rev = "b993af2bd38a60c815768c6ddb250010ed8a1a4f";
+ sha256 = "0bwmink8j8pgnxs2csskcbry46h5hl5iaqcdmm6c01ds6dcj1wql";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -3995,12 +3995,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2022-02-07";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "27578af8581ca109ac51f0f5d215d12bf6933be1";
- sha256 = "1bc0s8c9lbdzyycncz2cqkspb353h72hnqcd5v0vb19zbxvnhsqp";
+ rev = "d3473a9bfdebbd042428d895c84545bc85124159";
+ sha256 = "0ahijwjp21v79svgx44dlx5x69g6nh0qv9xi0x9markxj86660yz";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -4307,12 +4307,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2022-02-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "b1dbbc3807fcb82d6f562145debe6321610bef98";
- sha256 = "1jbi3lxpbky9y0k7c80shq451l5l3pbbr4wwaqrr76mjwrh49vq7";
+ rev = "f8f3932fb2abaa22e2536b5ac6ef1253a76647c7";
+ sha256 = "0h5q16i2n1rssml9ws5rvkmg9gslsdfw69asdq6rmr11w5kihyf9";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -4379,12 +4379,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2022-02-07";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "3cace9658fa504e2090b668f6652cf86ba4e81ab";
- sha256 = "1ly17jywj4idwq52x471imj7b1xm7q0j8xak3khr5jc8n7mnwydg";
+ rev = "aaa160d4423c6c0029f91af85a7e1f092b1aa966";
+ sha256 = "07n78gwj8q7mnw6rnzsmnl6cl51g5harrzn2g3fz6rhpr2f1hlwz";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -4583,12 +4583,12 @@ final: prev:
nvim-gps = buildVimPluginFrom2Nix {
pname = "nvim-gps";
- version = "2022-02-05";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-gps";
- rev = "6d6e936db0ad936039ef1a503c4b0bd0fe6286de";
- sha256 = "020ln7aq3h0rh5aslrgbdvjlbyvpyjxz9fa9lvsxx9bwcx6f1ci5";
+ rev = "6afd8f7a69e7008dabe048d4fb1ee8e467a72fdf";
+ sha256 = "13pgq09sxhfxxmrrqzc1f8b119f6d7yyx30lzbgr2vx59bh69ph2";
};
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
};
@@ -4727,12 +4727,12 @@ final: prev:
nvim-neoclip-lua = buildVimPluginFrom2Nix {
pname = "nvim-neoclip.lua";
- version = "2022-02-07";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "AckslD";
repo = "nvim-neoclip.lua";
- rev = "80d363113355e431016bd0a477b3bd56c7d82d95";
- sha256 = "1jgg0zkwfbxyfqlq5xd4vhzklmgs5p3xi8amn9vmga7zkx33cy63";
+ rev = "841021836ee00e7da6dbad819508e384f4e2362a";
+ sha256 = "1qjwyicpvbp8396lby62jd9fj8yh2dak5kk1vf64ppjvdf038hpd";
};
meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
};
@@ -4751,12 +4751,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2022-02-05";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "2edf33d0eb3c358716d4474d6081d361c80f7aa3";
- sha256 = "07hc9v9whyxxmnsf95a5fmmdxaw800ppaj0d588lnbnx1hs3dmpm";
+ rev = "27f3176b950dc803b61c29bd007e140c232544e5";
+ sha256 = "1b4s7vcr1d2d6jnkbsnybc55fmwgk52cdfqsm8x5m37fbwn4k6dq";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -4823,24 +4823,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2022-02-07";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "ea92e7bf7ccd1815b60342706356c373bb7df216";
- sha256 = "0dj0kcawslqv6iczgkr4b31449zplpz8k4xw5vw327mh9ciyb0xm";
+ rev = "b54de4b48a2e0481da8fc502e6e2a5cf5e4b0ba2";
+ sha256 = "0svlmm58w8c6mcqlx8gb47j6sn0z2i4rx9fpgihhhkk7pvjhinwc";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2022-02-08";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "c867d483a5daee60ba6fb7ec9151c5578e4e96ed";
- sha256 = "03m6wljyh4rqzjzir22q71hmcrijvk6rylyqmz088fsh214mss5l";
+ rev = "4990db79a87f49e56a3a1bb8507926ebd52ec4cc";
+ sha256 = "0c2wpk1bc3ga1m54s4kjmlskv3l2rkgf83xj1alm1rfgzwhl38vv";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -4895,12 +4895,12 @@ final: prev:
nvim-ts-autotag = buildVimPluginFrom2Nix {
pname = "nvim-ts-autotag";
- version = "2022-02-06";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-ts-autotag";
- rev = "5bbdfdaa303c698f060035f37a91eaad8d2f8e27";
- sha256 = "1gw1r3w9largx945lblbfacr3kc6pgx4qf1lhsgvp11i5v7qj1z5";
+ rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715";
+ sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m";
};
meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
};
@@ -4919,12 +4919,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2022-02-03";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "ece7deac8f4dfa643f17f3ed5bd85359e2e05f78";
- sha256 = "1625rcsyvailnrflvbrcizj8llqd47frynj4a1s3pdxg4m6d113q";
+ rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af";
+ sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@@ -5015,12 +5015,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
- version = "2022-02-02";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "d21c5cc8e2a28c58a28eee353dbab81c74e76382";
- sha256 = "13lzq4py15szsr3ii3nq8xdy7vcqa0fkzsz18c84yvyy0k38q7d1";
+ rev = "9b7902d28c6d50c481e5b46209ef0ebe5b78990f";
+ sha256 = "1gqrr9kc7l3ibdwacmfwqz7vb80wdrxzsv73g59l8vhp3q6m7q7a";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@@ -5063,12 +5063,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2022-01-16";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "55846471df3c6257cc2b4c7ad6001a55d52e2c34";
- sha256 = "179wwb7b65yyh345a5hnhdc10kxchddzicdlpiqkvy77rbrxc65a";
+ rev = "579f0a552154677ebe5a2f4a7e97f551967da998";
+ sha256 = "1g9zbylx8dvall19yxlymrqqp6bk24h5xs3z5a5i0dkwjvnaxx8v";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -5135,12 +5135,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer.nvim";
- version = "2022-02-05";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "e5c8c01374350b4fcfd56da2afc87434c51b3972";
- sha256 = "07ai0kwh5i6ka4kxfzz25rgi2f13s7cb24wk7swpasfxllsjypqp";
+ rev = "8551feef9030edf364188c26a6db797f827cda77";
+ sha256 = "060wjn7l518fhg35jqvx0m526qkvhrvc9n778hb3blnm19fj7p55";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -5304,12 +5304,12 @@ final: prev:
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence.nvim";
- version = "2022-02-05";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
- rev = "9aeb8e0cf3df82090955d609c9d64d74bf6b9afd";
- sha256 = "0qha4byqx0g048n2k9l1p066w0cps17nd77ij9mj79pdl9az1ylg";
+ rev = "ebdf23b9b180c7f162e3afb4a250c313ca2b7271";
+ sha256 = "0wygl17k2adbsy3pjyyb6amsrx14r11ldbqj21kmkjq289n58f6n";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
@@ -5557,12 +5557,12 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2022-02-04";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "23340bf6b19ab50504165462676f87a3e1bd4870";
- sha256 = "04kgaf2fay2gi82fwpl6nhjk7r2zw4nkv2dkm71gd7l6b3idx8k3";
+ rev = "1c77bd656b4802d890ec3382e438e45109e2b862";
+ sha256 = "0s1zhrnrkzb1xc3mb95930w31kad0vwff78z8ag2liawq10s2yhb";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -5737,12 +5737,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2022-02-01";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "058575f0bd94b115604bef9c4c48c5d02e21ffef";
- sha256 = "1mh2lf6lr6js9p8mqxs7pr97nczk8skxric3sw2z0vd9sf3pj2kk";
+ rev = "73c15bf820f1a94b3f1e52484ff102667bc1f987";
+ sha256 = "0n2q41k69ljca5vj2kapgwffrxk478lgd7l2yg8rsd54jsav5w7q";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -5954,12 +5954,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2022-02-04";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "8cd458541338cb7c71707cf9189ed9a27cfcdc15";
- sha256 = "16xldhfgpx0jjcsqpszjdq8mp4jqb3vwxcyh9wp3mpadbylyb8vv";
+ rev = "73622eaf3764237d32395b2b589fa9231eb44b83";
+ sha256 = "0xd6kzc043bmf27bs653d8q8vkdlr33ja0k63vmikz9vk91w3czb";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -6280,12 +6280,12 @@ final: prev:
tabnine-vim = buildVimPluginFrom2Nix {
pname = "tabnine-vim";
- version = "2022-01-20";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "codota";
repo = "tabnine-vim";
- rev = "251ab5f24cc376daf488b68e2d46a219854dcf5f";
- sha256 = "0v7jdrsyx754y13zwc6cjwqmwc4ic63ala55sxpa0bvsyx63cvdh";
+ rev = "bcb474cafade81a7fc1ecab4bd2ceda6fe359e66";
+ sha256 = "0mpawhqhnva3xqpxq27amd6hr0nls3zsxxwzb7bsrkzk4lc2p1kj";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/codota/tabnine-vim/";
@@ -6413,12 +6413,12 @@ final: prev:
telescope-coc-nvim = buildVimPluginFrom2Nix {
pname = "telescope-coc.nvim";
- version = "2022-02-07";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "telescope-coc.nvim";
- rev = "b6e2f29a9af35c141bf95a751e1cf628333efcb2";
- sha256 = "1mrbrnb8r0am34wbpkanka47aanw87yan6ykzs97mym5w101krpj";
+ rev = "0481789b0ba59d0b13f32a33f6b1b844f829f412";
+ sha256 = "0mnxy4fvk2n5qqvqhblnflyqzjd6z8w9ifnajfilzzrdfbny87jf";
};
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
};
@@ -7615,12 +7615,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2022-02-05";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "40a748c201d44d1b910159f201754adfd88b52c2";
- sha256 = "098hf2b0p7csr4b4fwfn2772xpj1m2c0zg9zf8ysgrf20lqw31a2";
+ rev = "936edac04920196b331edf3a056c42e5b926c0aa";
+ sha256 = "153503q7rfb58ga3hislhbn98hh7gcycwmdmdq22dagxd16zrr31";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -7687,12 +7687,12 @@ final: prev:
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
- version = "2021-12-24";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
- rev = "605dc002cabfec67eded553298aba21ab392ea78";
- sha256 = "1zlmibs23nyxkaj95h7z2m2p8xizvdr0i3477zs4y3lm6g0rqs23";
+ rev = "27e5ac299a0714025cc46fc1da11694a8662b058";
+ sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7";
};
meta.homepage = "https://github.com/google/vim-codefmt/";
};
@@ -8563,12 +8563,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2022-02-06";
+ version = "2022-02-08";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "d1e3a60213fba8ca4a6050ca3c71410960a77591";
- sha256 = "1igik71zcl70mi6fqsf55pk4g0sc891zfp0pnk086cy5klf6854v";
+ rev = "f7a4509fc1d1434daf922894f0aee140c9fa3f1a";
+ sha256 = "1g0v9miazm9z9nbi3s8k5imh75kp4d1mz5q95y2aqm12bi5a7890";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -9357,12 +9357,12 @@ final: prev:
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
- version = "2022-01-29";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "preservim";
repo = "vim-markdown";
- rev = "50d42082819cfa91745b6eff6e28ad5cbc8b27fa";
- sha256 = "1582y2cyqywbgf4pg8m5m2s0nd6wwgnm1nxy5kmrfcn1119hn639";
+ rev = "b4dc23e2b0c4ce1ed77eb630bf04238ee2871e2e";
+ sha256 = "1b4dz229a5qlfdigc4h0chrdb368bkskq11g6a6mc0fhnzm20j1i";
};
meta.homepage = "https://github.com/preservim/vim-markdown/";
};
@@ -9670,12 +9670,12 @@ final: prev:
vim-ocaml = buildVimPluginFrom2Nix {
pname = "vim-ocaml";
- version = "2022-01-24";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "ocaml";
repo = "vim-ocaml";
- rev = "9485f5aa3aa8e3d8505fce9a70efecc38dfee329";
- sha256 = "13lwc63iavqpwr25knrzs5f5mn7yrq8lhmm8p1d99vd5j7ngyy5x";
+ rev = "335ebc6e433afb972aa797be0587895a11dddab5";
+ sha256 = "079pfc897zz36mb36as7vq38b9njy42phjvmgarqlyqrwgjc0win";
};
meta.homepage = "https://github.com/ocaml/vim-ocaml/";
};
@@ -11520,12 +11520,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2022-02-06";
+ version = "2022-02-09";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "becbae7acad2fd80eeeb266ddb29f4cb1cc7846a";
- sha256 = "0ckf7ypq6cdzpcs1cknqccdx3vx3cydq19jsh83znmc1qs6zr4ab";
+ rev = "950f9e5ea26cf7f63cd9f0bf71bbae87e70c2158";
+ sha256 = "0gc7zh1h60mnds2xgsliblxg951swcnafxxla1w74yjjsn9cmsbd";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 5c4c92a1c596..85a41d2e5147 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -815,7 +815,7 @@ self: super: {
libiconv
];
- cargoSha256 = "sha256-y4yQ8Zv9bpfOyQrBX/TAuVYHhDsXdj0rh8nHJonxgcU=";
+ cargoSha256 = "sha256-JKi51kzCHMctUX6tT8K2Rq1slV3Ek67dCgbPjBkwPTE=";
};
in
''
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 48001be04886..7fe899fcf63b 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -694,6 +694,18 @@ let
};
};
+ eg2.vscode-npm-script = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-npm-script";
+ publisher = "eg2";
+ version = "0.3.24";
+ sha256 = "sha256-XgdMLecyZQXsgQAUh8V4eFLKaUF4WVlgy9iIGNDnR/I=";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "elm-ls-vscode";
@@ -1360,6 +1372,22 @@ let
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { };
+ ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "Theme-TomorrowKit";
+ publisher = "ms-vscode";
+ version = "0.1.4";
+ sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc=";
+ };
+ meta = with lib; {
+ description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes.";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit";
+ homepage = "https://github.com/microsoft/vscode-themes";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ratsclub ];
+ };
+ };
+
ms-python.python = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
@@ -1390,6 +1418,18 @@ let
};
};
+ ms-vscode.anycode = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "anycode";
+ publisher = "ms-vscode";
+ version = "0.0.57";
+ sha256 = "sha256-XwL7I+vwZJ6zx5IDZdfOUbq6M9IH/gi7MBe92cG1kDs=";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
mvllow.rose-pine = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "mvllow";
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index beaa8d557a75..09c5c02aee93 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -72,13 +72,15 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
icu
curl
openssl
+ ] ++ lib.optionals stdenv.isLinux [
lttng-ust-2-10
musl
];
nativeBuildInputs = [
- autoPatchelfHook
python3.pkgs.wrapPython
+ ] ++ lib.optionals stdenv.isLinux [
+ autoPatchelfHook
];
pythonPath = with python3.pkgs; [
@@ -101,6 +103,8 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process
declare kept_aside="${{
"x86_64-linux" = "attach_linux_amd64.so";
+ "aarch64-darwin" = "attach_x86_64.dylib";
+ "x86_64-darwin" = "attach_x86_64.dylib";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}"
mv "$kept_aside" "$kept_aside.hidden"
rm *.so *.dylib *.dll *.exe *.pdb
@@ -118,7 +122,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec {
meta = with lib; {
license = licenses.mit;
- platforms = [ "x86_64-linux" ];
- maintainers = [ maintainers.jraygauthier ];
+ platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
+ maintainers = with maintainers; [ jraygauthier jfchevrette ];
};
}
diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch
new file mode 100644
index 000000000000..b17df9a492e5
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch
@@ -0,0 +1,232 @@
+diff --git a/src/control/control.c b/src/control/control.c
+index d66ed75..42cecad 100644
+--- a/src/control/control.c
++++ b/src/control/control.c
+@@ -838,6 +838,10 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ #ifndef PIC
+ extern void *snd_control_open_symbols(void);
+ #endif
++
++ snd_config_t *libs = NULL;
++ const char *libs_lib = NULL;
++
+ if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) {
+ if (name)
+ SNDERR("Invalid type for CTL %s definition", name);
+@@ -879,6 +883,19 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ SNDERR("Invalid type for %s", id);
+ goto _err;
+ }
++
++ continue;
++ }
++ // Handle an array of extra libs.
++ if (strcmp(id, "libs") == 0) {
++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) {
++ SNDERR("Invalid type for libs definition in CTL %s definition",
++ str);
++ goto _err;
++ }
++
++ libs = n;
++
+ continue;
+ }
+ if (strcmp(id, "open") == 0) {
+@@ -903,7 +920,62 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ open_name = buf;
+ sprintf(buf, "_snd_ctl_%s_open", str);
+ }
+- if (!lib) {
++
++#ifndef PIC
++ snd_control_open_symbols();
++#endif
++
++ // Normal alsa behaviour when there is no libs array.
++ if (!libs) {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1);
++ }
++ }
++ // Handle libs array.
++ // Suppresses error messages if any function is loaded successfully.
++ else {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0);
++ }
++
++ if (!open_func) {
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ err = snd_config_get_string(n, &libs_lib);
++ if (err < 0) {
++ SNDERR("Invalid entry in CTL %s libs definition", str);
++ goto _err;
++ }
++
++ if (!open_func) {
++ open_func = snd_dlobj_cache_get(libs_lib, open_name,
++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0);
++ }
++ }
++ }
++
++ // Print error messages.
++ if (!open_func) {
++ if (lib) {
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ lib, open_name);
++ }
++
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ snd_config_get_string(n, &libs_lib);
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ libs_lib, open_name);
++ }
++ }
++ }
++
++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look.
++ if (!lib && (!libs || !libs_lib)) {
+ const char *const *build_in = build_in_ctls;
+ while (*build_in) {
+ if (!strcmp(*build_in, str))
+@@ -919,12 +991,11 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ lib = buf1;
+ sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str);
+ }
+- }
+-#ifndef PIC
+- snd_control_open_symbols();
+-#endif
+- open_func = snd_dlobj_cache_get(lib, open_name,
++
++ open_func = snd_dlobj_cache_get(lib, open_name,
+ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1);
++ }
++
+ if (open_func) {
+ err = open_func(ctlp, name, ctl_root, ctl_conf, mode);
+ if (err >= 0) {
+diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
+index 2e24338..7f489f4 100644
+--- a/src/pcm/pcm.c
++++ b/src/pcm/pcm.c
+@@ -2116,6 +2116,10 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ #ifndef PIC
+ extern void *snd_pcm_open_symbols(void);
+ #endif
++
++ snd_config_t *libs = NULL;
++ const char *libs_lib = NULL;
++
+ if (snd_config_get_type(pcm_conf) != SND_CONFIG_TYPE_COMPOUND) {
+ char *val;
+ id = NULL;
+@@ -2160,6 +2164,19 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ SNDERR("Invalid type for %s", id);
+ goto _err;
+ }
++
++ continue;
++ }
++ // Handle an array of extra libs.
++ if (strcmp(id, "libs") == 0) {
++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) {
++ SNDERR("Invalid type for libs definition in PCM %s definition",
++ str);
++ goto _err;
++ }
++
++ libs = n;
++
+ continue;
+ }
+ if (strcmp(id, "open") == 0) {
+@@ -2184,7 +2201,62 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ open_name = buf;
+ sprintf(buf, "_snd_pcm_%s_open", str);
+ }
+- if (!lib) {
++
++#ifndef PIC
++ snd_pcm_open_symbols(); /* this call is for static linking only */
++#endif
++
++ // Normal alsa behaviour when there is no libs array.
++ if (!libs) {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1);
++ }
++ }
++ // Handle libs array.
++ // Suppresses error messages if any function is loaded successfully.
++ else {
++ if (lib) {
++ open_func = snd_dlobj_cache_get(lib, open_name,
++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0);
++ }
++
++ if (!open_func) {
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ err = snd_config_get_string(n, &libs_lib);
++ if (err < 0) {
++ SNDERR("Invalid entry in PCM %s libs definition", str);
++ goto _err;
++ }
++
++ if (!open_func) {
++ open_func = snd_dlobj_cache_get(libs_lib, open_name,
++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0);
++ }
++ }
++ }
++
++ // Print error messages.
++ if (!open_func) {
++ if (lib) {
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ lib, open_name);
++ }
++
++ snd_config_for_each(i, next, libs) {
++ snd_config_t *n = snd_config_iterator_entry(i);
++
++ snd_config_get_string(n, &libs_lib);
++ SNDERR("Either %s cannot be opened or %s was not defined inside",
++ libs_lib, open_name);
++ }
++ }
++ }
++
++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look.
++ if (!lib && (!libs || !libs_lib)) {
+ const char *const *build_in = build_in_pcms;
+ while (*build_in) {
+ if (!strcmp(*build_in, str))
+@@ -2200,12 +2272,11 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ lib = buf1;
+ sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
+ }
+- }
+-#ifndef PIC
+- snd_pcm_open_symbols(); /* this call is for static linking only */
+-#endif
+- open_func = snd_dlobj_cache_get(lib, open_name,
++
++ open_func = snd_dlobj_cache_get(lib, open_name,
+ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1);
++ }
++
+ if (open_func) {
+ err = open_func(pcmp, name, pcm_root, pcm_conf, stream, mode);
+ if (err >= 0) {
diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
index 445d171d31fd..58e5990ae0a6 100644
--- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
hash = "sha256-rVgpk9Us21+xWaC+q2CmrFfqsMwb34XcTbbWGX8CMz8=";
};
+ patches = [
+ # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.
+ # The nixos modules for pulseaudio, jack, and pipewire are leveraging this
+ # "libs" field to declare locations for both native and 32bit plugins, in
+ # order to support apps with 32bit sound running on x86_64 architecture.
+ ./alsa-plugin-conf-multilib.patch
+ ];
+
enableParallelBuilding = true;
postInstall = ''
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 939a7115e89b..27f32c648131 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
version = "2.4.3";
outputs = [ "out" "dev" "man" ];
+ separateDebugInfo = true;
src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
index 73b9cf08b808..5ec2bd70fdb6 100644
--- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
- version = "1.0.31";
+ version = "1.0.32";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = version;
- sha256 = "sha256-agtaQ5Te4WcbIdCt8TDK4Y2y/9aHrDCUWuPRE5+aFjc=";
+ sha256 = "sha256-EV7byqfoz0sAIkf/hgZh+m7D2+54DEnE4td4CTX6c4s=";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--workspace" ];
- cargoSha256 = "sha256-QFHyrvLR1v09RNlXiO/E+blvxPukKwPRRX+vQvlZSNQ=";
+ cargoSha256 = "sha256-/bf5JQgyFN8TH7o2TWHX5sv/NkxBLJ495iVW8c9Vqis=";
# Purposefully don't install systemd unit file, that's for NixOS
postInstall = ''
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 3c7e899cba71..833598448878 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -81,12 +81,12 @@ let
in {
inherit makeLinuxHeaders;
- linuxHeaders = let version = "5.15.5"; in
+ linuxHeaders = let version = "5.16"; in
makeLinuxHeaders {
inherit version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "sha256-6VZaMBUlrIHBQs64MvkFPdVoXhB9vPdT0N5MWLyYhR8=";
+ sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82";
};
patches = [
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
diff --git a/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch
new file mode 100644
index 000000000000..61ad2a474f9a
--- /dev/null
+++ b/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch
@@ -0,0 +1,28 @@
+From 59d91e57d103fb4686d2f45ee3c688878244367a Mon Sep 17 00:00:00 2001
+From: Christian Kampka
+Date: Tue, 24 Nov 2020 22:12:40 +0100
+Subject: [PATCH] Remove unused function 'after_eq'
+
+---
+ keyctl_watch.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/keyctl_watch.c b/keyctl_watch.c
+index a70a19a..c4ca7f7 100644
+--- a/keyctl_watch.c
++++ b/keyctl_watch.c
+@@ -47,11 +47,6 @@ static struct watch_notification_filter filter = {
+ },
+ };
+
+-static inline bool after_eq(unsigned int a, unsigned int b)
+-{
+- return (signed int)(a - b) >= 0;
+-}
+-
+ static void consumer_term(int sig)
+ {
+ consumer_stop = 1;
+--
+2.28.0
+
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 71f708e210d4..f307bd56d1cf 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm";
})
./conf-symlink.patch
+ # This patch solves a duplicate symbol error when building with a clang stdenv
+ # Before removing this patch, please ensure the package still builds by running eg.
+ # nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }'
+ ./0001-Remove-unused-function-after_eq.patch
];
makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";
diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix
index 8b979d479562..aeb261aaaca5 100644
--- a/pkgs/os-specific/linux/libpsm2/default.nix
+++ b/pkgs/os-specific/linux/libpsm2/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libpsm2";
- version = "11.2.185";
+ version = "11.2.203";
preConfigure= ''
export UDEVDIR=$out/etc/udev
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "opa-psm2";
rev = "PSM2_${version}";
- sha256 = "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg";
+ sha256 = "sha256-W5Mg5ATUARMFAy1VVpMKPar0VpbKfrkxa6bDhqVYpoc=";
};
postInstall = ''
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 65bf01aa4cfc..1476ae49006c 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "linux-pam";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchurl {
url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz";
- sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw=";
+ sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0=";
};
patches = [ ./suid-wrapper-path.patch ];
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index 02321d843510..f7543291deda 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "rdma-core";
- version = "38.1";
+ version = "39.0";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${version}";
- sha256 = "05r5f9agpn7dcx5jmggrsm9953w2k6ly6gfbg9b8wjdc853apqp7";
+ sha256 = "sha256-7Z06bdCtv/gdZKzKfcU+JrWl4+b6b/cdKp8pMLCZZo0=";
};
strictDeps = true;
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 2d5b3e2ab558..5389caaa33fb 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sysstat";
- version = "12.4.3";
+ version = "12.4.4";
src = fetchurl {
url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz";
- sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0=";
+ sha256 = "sha256-lRLnR54E+S4lHFxrS9lLj2Q9ISvQ6Yao6k0Uem6UPSQ=";
};
buildInputs = [ gettext ];
diff --git a/pkgs/os-specific/linux/wlgreet/default.nix b/pkgs/os-specific/linux/wlgreet/default.nix
index 4758945e41ab..932aa47fd714 100644
--- a/pkgs/os-specific/linux/wlgreet/default.nix
+++ b/pkgs/os-specific/linux/wlgreet/default.nix
@@ -4,17 +4,17 @@
}:
rustPlatform.buildRustPackage rec {
- pname = "wlgreet";
- version = "0.3";
+ pname = "wlgreet-unstable";
+ version = "2022-01-25";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
- repo = pname;
- rev = version;
- sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc";
+ repo = "wlgreet";
+ rev = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c";
+ sha256 = "0la4xlikw61cxvbkil1d22dgvazi7rs17n5i2z02090fvnfxxzxh";
};
- cargoSha256 = "1lwy8xmkl9n3fj3wlf80wp728nn9p5rjnbgmm2cbpqxklcgbmxhm";
+ cargoSha256 = "651d2bf01612534f1c4b0472c812095a86eb064d16879380c87f684c04fe0d8d";
meta = with lib; {
description = "Raw wayland greeter for greetd, to be run under sway or similar";
diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix
index a317925d228d..f6cb86e409c7 100644
--- a/pkgs/servers/calibre-web/default.nix
+++ b/pkgs/servers/calibre-web/default.nix
@@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
- version = "0.6.15";
+ version = "0.6.16";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
- sha256 = "02caq07rzx23iad13wxg8g9z0z77f5ycdrav6fp7z5rl1wi0yc3r";
+ sha256 = "sha256-vRnzsV9pubAmyVSxZpBK+mD9Bkbt6BQYo5S0Jsl26Ns=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index 015802ac31eb..6bedb469f4d4 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bftpd";
- version = "6.0";
+ version = "6.1";
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-t+YCys67drYKcD3GXxSVzZo4HTRZArIpA6EofeyPAlw=";
+ sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8=";
};
preConfigure = ''
diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix
index 8d8ad16e7849..81e1c17467cc 100644
--- a/pkgs/servers/gemini/gmnisrv/default.nix
+++ b/pkgs/servers/gemini/gmnisrv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mime-types, scdoc }:
+{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mailcap, scdoc }:
stdenv.mkDerivation rec {
pname = "gmnisrv";
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
--replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config"
'';
- MIMEDB = "${mime-types}/etc/mime.types";
+ MIMEDB = "${mailcap}/etc/mime.types";
nativeBuildInputs = [ pkg-config scdoc ];
- buildInputs = [ openssl mime-types ];
+ buildInputs = [ openssl mailcap ];
meta = with lib; {
description = "A simple Gemini protocol server";
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 00af1e21899f..8f4ba61e868b 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -761,7 +761,7 @@
"sendgrid" = ps: with ps; [ sendgrid ];
"sense" = ps: with ps; [ sense-energy ];
"sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
- "senseme" = ps: with ps; [ ]; # missing inputs: aiosenseme
+ "senseme" = ps: with ps; [ aiosenseme ];
"sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
"sensor" = ps: with ps; [ sqlalchemy ];
"sentry" = ps: with ps; [ sentry-sdk ];
@@ -835,7 +835,7 @@
"statistics" = ps: with ps; [ sqlalchemy ];
"statsd" = ps: with ps; [ statsd ];
"steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
- "steamist" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: aiosteamist discovery30303
+ "steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ];
"stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron
"stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
"stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ];
@@ -1460,6 +1460,7 @@
"season"
"select"
"sense"
+ "senseme"
"sensor"
"sentry"
"seventeentrack"
@@ -1507,6 +1508,7 @@
"startca"
"statistics"
"statsd"
+ "steamist"
"stream"
"stt"
"subaru"
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index 86c9ad6c00dc..a67ea3cc03e7 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -1,12 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }:
-let
- apache-24-patch = fetchurl {
- name = "compile-against-apache24.diff";
- url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
- sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
- };
-in
stdenv.mkDerivation rec {
pname = "mod_fastcgi";
version = "2.4.7.1";
@@ -18,8 +11,6 @@ stdenv.mkDerivation rec {
hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg=";
};
- patches = [ apache-24-patch ];
-
buildInputs = [ apacheHttpd ];
preBuild = ''
@@ -43,6 +34,5 @@ stdenv.mkDerivation rec {
'';
platforms = lib.platforms.linux;
- broken = true; # patch 'compile-against-apache24.diff' no longer works
};
}
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 6327f5079386..5bae5c8b232f 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
- version = "0.20.428";
+ version = "0.20.539";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "Wf1eQkKovRIMUQeqadmOQl5R0syoKWiZENjRR4jGUdk=";
+ sha256 = "TTaPXPEnxKYQFtYD+7AkTydtQbQgdrkaoZL6p3EFkYc=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix
index 3b99b595292f..3b0fb8cb78bd 100644
--- a/pkgs/servers/jackett/deps.nix
+++ b/pkgs/servers/jackett/deps.nix
@@ -8,7 +8,7 @@
(fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; })
(fetchNuGet { pname = "coverlet.msbuild"; version = "3.1.0"; sha256 = "1rx5x2zks2aryy6mbly86a83gxzm0y7bbx9834b3224673rs7ra0"; })
(fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; })
- (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.1.0"; sha256 = "17khlhfl3pg2619pyn3rbyw5hbjwra3rwzrkiqcwkikfla5185gf"; })
+ (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.0"; sha256 = "07jsyhlrg0jb1cjn1p20wp2c9rsjqxv7kh6vvd0xv0mjd88idchr"; })
(fetchNuGet { pname = "FluentAssertions"; version = "6.2.0"; sha256 = "10zhr7hgzm9w0gfg0sa0h2qdlna0w7n2jl72s4j7hi6mf68px2xm"; })
(fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; })
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 48d6118add95..fd80dc4b87c6 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "klipper";
- version = "unstable-2022-01-09";
+ version = "unstable-2022-02-07";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
- rev = "6e6ad7b5201d3452aa605f4ae852c51239c2c7d8";
- sha256 = "sha256-cflcGweEjB0xj2LhYJzyvqFSQen2vhYXlL7lz/HoGaM=";
+ rev = "6d7c03365ad13c4661675aaccd0a3dc5be544493";
+ sha256 = "sha256-xFSZkOFETGcJXA6CUCReoyNZXhDAfgKkWoeDRqueBVw=";
};
sourceRoot = "source/klippy";
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 251c977bd4df..db9443fc04a9 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,20 +1,22 @@
-{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "alertmanager";
- version = "0.21.0";
+ version = "0.23.0";
rev = "v${version}";
- goPackagePath = "github.com/prometheus/alertmanager";
-
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
- sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41";
+ sha256 = "sha256-06mKgWUyw5jsjKiRXQ9/oqHvFdkY2nS9Z3eW60lTNbU=";
};
- ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [
+ vendorSha256 = "sha256-zJvzCC7Vn5repWssyDuGtoUSZC2ojQhMqDX5Orr0ST0=";
+
+ subPackages = [ "cmd/alertmanager" "cmd/amtool" ];
+
+ ldflags = let t = "github.com/prometheus/common/version"; in [
"-X ${t}.Version=${version}"
"-X ${t}.Revision=${src.rev}"
"-X ${t}.Branch=unknown"
@@ -28,6 +30,8 @@ buildGoPackage rec {
postInstall = ''
$out/bin/amtool --completion-script-bash > amtool.bash
installShellCompletion amtool.bash
+ $out/bin/amtool --completion-script-zsh > amtool.zsh
+ installShellCompletion amtool.zsh
'';
meta = with lib; {
diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix
index 939061c6a6e7..d0ed5cc97a64 100644
--- a/pkgs/servers/radicale/3.x.nix
+++ b/pkgs/servers/radicale/3.x.nix
@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "radicale";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
rev = "v${version}";
- hash = "sha256-vX6lYiDqpQeWVLotyt2ODwcjskWB6EuCky3/V8m1m7Q=";
+ hash = "sha256-PGPUV0oOWmzc7Lih6D0sCwIuUB8FOyOrYUEIvMpr4HE=";
};
postPatch = ''
diff --git a/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/pkgs/servers/sql/mariadb/connector-c/3_2.nix
index 8b1c8b04bdce..1e9884eb7333 100644
--- a/pkgs/servers/sql/mariadb/connector-c/3_2.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/3_2.nix
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
- version = "3.2.3";
- sha256 = "1x1i4ck4c3sgkw083v02zk3rbkm5h0x1vl4m58j95q1qcijkiamn";
+ version = "3.2.5";
+ sha256 = "0w0fimdiiqrrm012iflz8l4rnafryq7y0qqijzxn7nwzxhm9jsr9";
})
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index 3f0697bd2cc2..dbf8e36e9e7d 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -11,10 +11,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
- urls = [
- "https://downloads.mariadb.org/f/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
- "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"
- ];
+ url = "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz";
inherit sha256;
};
diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix
index 142dfe29fa22..ab8f7f9a6993 100644
--- a/pkgs/servers/sql/proxysql/default.nix
+++ b/pkgs/servers/sql/proxysql/default.nix
@@ -129,6 +129,10 @@ stdenv.mkDerivation rec {
sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config
+ # https://github.com/sysown/proxysql/issues/3679
+ # TODO: remove when upgrading past 2.3.2
+ sed -i -e 's@^\(\s\+cd curl/curl \&\& ./configure .*\) \(--with-ssl=.*\)$@\1 --without-zstd \2@' Makefile
+
popd
patchShebangs .
'';
diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index ac29b20a10d9..c09e60cd0e51 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "Tautulli";
- version = "2.8.1";
+ version = "2.9.3";
format = "other";
pythonPath = [ setuptools ];
@@ -12,7 +12,7 @@ buildPythonApplication rec {
owner = "Tautulli";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vaH8PdWsWwBE2eW0i1QsjfOZdG5luME12gAY2uykyng=";
+ sha256 = "sha256-LaKbhRAC/T4BuBHLQ+qUZYGsWjj/v8xg6yz55yEib0A=";
};
installPhase = ''
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index cf264f11de8c..e0ab463b4180 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch
, coreutils
, which
, gnused
@@ -146,6 +147,8 @@ let
sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=";
};
+ patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4
+
# Fix FHS paths in tests
postPatch = ''
# src/fish_tests.cpp
diff --git a/pkgs/shells/fish/tests-pcre2-update.patch b/pkgs/shells/fish/tests-pcre2-update.patch
new file mode 100644
index 000000000000..5e0c327c540a
--- /dev/null
+++ b/pkgs/shells/fish/tests-pcre2-update.patch
@@ -0,0 +1,7 @@
+Adapted formating to 3.3.1 from
+https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a
+--- a/src/fish_tests.cpp
++++ b/src/fish_tests.cpp
+@@ -5726,2 +5725,0 @@
+- {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
+- {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 18315d879c96..19d3e70c0a3a 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -7,25 +7,25 @@ let
# match gitstatus version with given `gitstatus_version`:
# https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info
gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec {
- version = "1.5.1";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
rev = "v${version}";
- sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh";
+ sha256 = "17giwdjrsmr71xskxxf506n8kaab8zx77fv267fx37ifi57nffk5";
};
});
in
stdenv.mkDerivation rec {
pname = "powerlevel10k";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
rev = "v${version}";
- sha256 = "sha256-gSPCNLK733+9NWdalqUJ8nzkhoQxurXAYX9t4859j2s=";
+ sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c";
};
patches = [
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 2951813c0f71..0777fa830c10 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,3 +1,5 @@
+# shellcheck shell=bash
+__nixpkgs_setup_set_original=$-
set -eu
set -o pipefail
shopt -s inherit_errexit
@@ -1361,5 +1363,7 @@ runHook userHook
dumpVars
-# Disable nounset for nix-shell.
-set +u
+# Restore the original options for nix-shell
+[[ $__nixpkgs_setup_set_original == *e* ]] || set +e
+[[ $__nixpkgs_setup_set_original == *u* ]] || set +u
+unset -v __nixpkgs_setup_set_original
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index b7980c478c66..4110327946d9 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -67,4 +67,6 @@ with pkgs;
writers = callPackage ../build-support/writers/test.nix {};
dhall = callPackage ./dhall { };
+
+ makeWrapper = callPackage ./make-wrapper {};
}
diff --git a/pkgs/test/make-wrapper/default.nix b/pkgs/test/make-wrapper/default.nix
new file mode 100644
index 000000000000..6e70945ee194
--- /dev/null
+++ b/pkgs/test/make-wrapper/default.nix
@@ -0,0 +1,136 @@
+{ lib
+, writeText
+, writeCBin
+, writeShellScript
+, makeWrapper
+, runCommand
+, which
+, ...
+}:
+
+let
+ # Testfiles
+ foofile = writeText "foofile" "foo";
+ barfile = writeText "barfile" "bar";
+
+ # Wrapped binaries
+ wrappedArgv0 = writeCBin "wrapped-argv0" ''
+ #include
+ #include
+
+ void main(int argc, char** argv) {
+ printf("argv0=%s", argv[0]);
+ exit(0);
+ }
+ '';
+ wrappedBinaryVar = writeShellScript "wrapped-var" ''
+ echo "VAR=$VAR"
+ '';
+ wrappedBinaryArgs = writeShellScript "wrapped-args" ''
+ echo "$@"
+ '';
+
+ mkWrapperBinary = { name, args, wrapped ? wrappedBinaryVar }: runCommand name
+ {
+ nativeBuildInputs = [ makeWrapper ];
+ } ''
+ mkdir -p $out/bin
+ makeWrapper "${wrapped}" "$out/bin/${name}" ${lib.escapeShellArgs args}
+ '';
+
+ mkTest = cmd: toExpect: ''
+ output="$(${cmd})"
+ if [[ "$output" != '${toExpect}' ]]; then
+ echo "test failed: the output of ${cmd} was '$output', expected '${toExpect}'"
+ echo "the wrapper contents:"
+ for i in ${cmd}; do
+ if [[ $i =~ ^test- ]]; then
+ cat $(which $i)
+ fi
+ done
+ exit 1
+ fi
+ '';
+in
+runCommand "make-wrapper-test"
+{
+ nativeBuildInputs = [
+ which
+ (mkWrapperBinary { name = "test-argv0"; args = [ "--argv0" "foo" ]; wrapped = "${wrappedArgv0}/bin/wrapped-argv0"; })
+ (mkWrapperBinary { name = "test-set"; args = [ "--set" "VAR" "abc" ]; })
+ (mkWrapperBinary { name = "test-set-default"; args = [ "--set-default" "VAR" "abc" ]; })
+ (mkWrapperBinary { name = "test-unset"; args = [ "--unset" "VAR" ]; })
+ (mkWrapperBinary { name = "test-run"; args = [ "--run" "echo bar" ]; })
+ (mkWrapperBinary { name = "test-run-and-set"; args = [ "--run" "export VAR=foo" "--set" "VAR" "bar" ]; })
+ (mkWrapperBinary { name = "test-args"; args = [ "--add-flags" "abc" ]; wrapped = wrappedBinaryArgs; })
+ (mkWrapperBinary { name = "test-prefix"; args = [ "--prefix" "VAR" ":" "abc" ]; })
+ (mkWrapperBinary { name = "test-suffix"; args = [ "--suffix" "VAR" ":" "abc" ]; })
+ (mkWrapperBinary { name = "test-prefix-and-suffix"; args = [ "--prefix" "VAR" ":" "foo" "--suffix" "VAR" ":" "bar" ]; })
+ (mkWrapperBinary { name = "test-prefix-multi"; args = [ "--prefix" "VAR" ":" "abc:foo:foo" ]; })
+ (mkWrapperBinary { name = "test-suffix-each"; args = [ "--suffix-each" "VAR" ":" "foo bar:def" ]; })
+ (mkWrapperBinary { name = "test-prefix-each"; args = [ "--prefix-each" "VAR" ":" "foo bar:def" ]; })
+ (mkWrapperBinary { name = "test-suffix-contents"; args = [ "--suffix-contents" "VAR" ":" "${foofile} ${barfile}" ]; })
+ (mkWrapperBinary { name = "test-prefix-contents"; args = [ "--prefix-contents" "VAR" ":" "${foofile} ${barfile}" ]; })
+ ];
+}
+ (
+ # --argv0 works
+ mkTest "test-argv0" "argv0=foo"
+
+ # --set works
+ + mkTest "test-set" "VAR=abc"
+ # --set overwrites the variable
+ + mkTest "VAR=foo test-set" "VAR=abc"
+ # --set-default works
+ + mkTest "test-set-default" "VAR=abc"
+ # --set-default doesn"t overwrite the variable
+ + mkTest "VAR=foo test-set-default" "VAR=foo"
+ # --unset works
+ + mkTest "VAR=foo test-unset" "VAR="
+
+ # --add-flags works
+ + mkTest "test-args" "abc"
+ # given flags are appended
+ + mkTest "test-args foo" "abc foo"
+
+ # --run works
+ + mkTest "test-run" "bar\nVAR="
+ # --run & --set works
+ + mkTest "test-run-and-set" "VAR=bar"
+
+ # --prefix works
+ + mkTest "VAR=foo test-prefix" "VAR=abc:foo"
+ # sets variable if not set yet
+ + mkTest "test-prefix" "VAR=abc"
+ # prepends value only once
+ + mkTest "VAR=abc test-prefix" "VAR=abc"
+ # Moves value to the front if it already existed
+ + mkTest "VAR=foo:abc test-prefix" "VAR=abc:foo"
+ + mkTest "VAR=abc:foo:bar test-prefix-multi" "VAR=abc:foo:bar"
+ # Doesn't overwrite parts of the string
+ + mkTest "VAR=test:abcde:test test-prefix" "VAR=abc:test:abcde:test"
+ # Only append the value once when given multiple times in a parameter
+ # to makeWrapper
+ + mkTest "test-prefix" "VAR=abc"
+
+
+ # --suffix works
+ + mkTest "VAR=foo test-suffix" "VAR=foo:abc"
+ # sets variable if not set yet
+ + mkTest "test-suffix" "VAR=abc"
+ # adds the same value only once
+ + mkTest "VAR=abc test-suffix" "VAR=abc"
+ + mkTest "VAR=abc:foo test-suffix" "VAR=abc:foo"
+ # --prefix in combination with --suffix
+ + mkTest "VAR=abc test-prefix-and-suffix" "VAR=foo:abc:bar"
+
+ # --suffix-each works
+ + mkTest "VAR=abc test-suffix-each" "VAR=abc:foo:bar:def"
+ # --prefix-each works
+ + mkTest "VAR=abc test-prefix-each" "VAR=bar:def:foo:abc"
+ # --suffix-contents works
+ + mkTest "VAR=abc test-suffix-contents" "VAR=abc:foo:bar"
+ # --prefix-contents works
+ + mkTest "VAR=abc test-prefix-contents" "VAR=bar:foo:abc"
+ + "touch $out"
+ )
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 06f87f0a7ae7..c7bf1c45b11e 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
- version = "1.205";
+ version = "1.207";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
- sha256 = "sha256-agE+Bspw1JL1R1HvNeWW4xr2m0+H83f/9jk6EjQwxWk=";
+ sha256 = "sha256-pT9dA2sRTozVAYA8VKPlL+AU8r9FABHXp6Pbqa8aSTo=";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
index 84372423d611..9528d6e7aee4 100644
--- a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
+++ b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "aws-lambda-runtime-interface-emulator";
- version = "1.0";
+ version = "1.3";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-lambda-runtime-interface-emulator";
rev = "v${version}";
- sha256 = "sha256-vbVygZzLlJlxaRF/LIqSJP0gZGyu1wSSdeVjILl/OJE=";
+ sha256 = "sha256-h4T4Go5gzKF1g1jSNZkx5U0icFxEZMYyS4L6cZMTFEY=";
};
- vendorSha256 = "sha256-WcvYPGgkrK7Zs5IplAoUTay5ys9LrDJHpRN3ywEdWRM=";
+ vendorSha256 = "sha256-ncUtJKJnWiut0ZVKm3MLWKq8eyHrTgv6Nva8xcvvqSI=";
# disabled because I lack the skill
doCheck = false;
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 49762e3278c8..11cf6c53076c 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -35,11 +35,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.22.21"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- hash = "sha256-yzfy6MjXC6LeydLNVXQvcK4UmpVQP/jJ+W2jMgpNMgw=";
+ hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 6f6e06db2a08..efd1ecfee3c1 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -29,6 +29,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
--replace "javaproperties~=0.5.1" "javaproperties" \
--replace "pytz==2019.1" "pytz" \
--replace "scp~=0.13.2" "scp" \
+ --replace "PyNaCl~=1.4.0" "PyNaCl" \
--replace "jsondiff~=1.2.0" "jsondiff~=1.2" \
--replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \
--replace "mock~=4.0" "mock"
@@ -141,6 +142,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
pydocumentdb
PyGithub
pygments
+ pynacl
pyopenssl
pytz
pyyaml
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index a24aadd80c5e..d27805bb257e 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -466,7 +466,8 @@ let
inherit version;
sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE=";
};
- # sdist lacks tests
+
+ # sdist doesn't provide tests
doCheck = false;
});
@@ -502,6 +503,16 @@ let
};
});
+ argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec {
+ version = "1.8.0";
+
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
+ inherit version;
+ sha256 = "sha256-SreailmO/AgRBGv3dnj4VkMnbokAzWT5xPEPEQ4QEb0=";
+ };
+ });
+
sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec {
name = "sshtunnel-${version}";
version = "0.1.5";
diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix
index 65ca85b463e9..03571ac7cf75 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/pkgs/tools/admin/gixy/default.nix
@@ -1,11 +1,26 @@
{ lib, fetchFromGitHub, python3 }:
-python3.pkgs.buildPythonApplication rec {
+let
+ python = python3.override {
+ packageOverrides = self: super: {
+ pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec {
+ version = "2.4.7";
+ src = fetchFromGitHub {
+ owner = "pyparsing";
+ repo = "pyparsing";
+ rev = "pyparsing_${version}";
+ sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h";
+ };
+ });
+ };
+ };
+in
+python.pkgs.buildPythonApplication rec {
pname = "gixy";
version = "0.1.20";
# package is only compatible with python 2.7 and 3.5+
- disabled = with python3.pkgs; !(pythonAtLeast "3.5" || isPy27);
+ disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27);
# fetching from GitHub because the PyPi source is missing the tests
src = fetchFromGitHub {
@@ -19,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
sed -ie '/argparse/d' setup.py
'';
- propagatedBuildInputs = with python3.pkgs; [
+ propagatedBuildInputs = with python.pkgs; [
cached-property
configargparse
pyparsing
diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 266eb0e509eb..496f478be8a6 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -1,11 +1,11 @@
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }:
yarn2nix-moretea.mkYarnPackage rec {
- version = "0.9.59";
+ version = "0.9.79";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz";
- sha256 = "05dalrm82mspqrjqb3ya7cjd3vbn1a4wij8cdndfyh0rrbwvglys";
+ sha256 = "17f34ifzdrkbap2hhd0y0rdcn8j0svxzsqw0qhcp3h68z3098hdv";
};
packageJSON = ./package.json;
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 9bb3c2feef8b..4a0f5bf6137a 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
{
"name": "meshcentral",
- "version": "0.9.59",
+ "version": "0.9.79",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@@ -47,7 +47,7 @@
"minimist": "^1.2.5",
"multiparty": "^4.2.1",
"@yetzt/nedb": "^1.8.0",
- "node-forge": "^0.10.0",
+ "node-forge": "^1.0.0",
"ws": "^5.2.3",
"yauzl": "^2.10.0"
},
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index cadd3df7171d..219114d50fef 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -2,115 +2,123 @@
# yarn lockfile v1
-"@babel/code-frame@^7.16.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
- integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
+"@babel/code-frame@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+ integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
dependencies:
- "@babel/highlight" "^7.16.0"
+ "@babel/highlight" "^7.16.7"
-"@babel/generator@^7.16.0", "@babel/generator@^7.4.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2"
- integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==
+"@babel/generator@^7.17.0", "@babel/generator@^7.4.0":
+ version "7.17.0"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
+ integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
dependencies:
- "@babel/types" "^7.16.0"
+ "@babel/types" "^7.17.0"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-function-name@^7.16.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
- integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==
+"@babel/helper-environment-visitor@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+ integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
dependencies:
- "@babel/helper-get-function-arity" "^7.16.0"
- "@babel/template" "^7.16.0"
- "@babel/types" "^7.16.0"
+ "@babel/types" "^7.16.7"
-"@babel/helper-get-function-arity@^7.16.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
- integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==
+"@babel/helper-function-name@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
+ integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
dependencies:
- "@babel/types" "^7.16.0"
+ "@babel/helper-get-function-arity" "^7.16.7"
+ "@babel/template" "^7.16.7"
+ "@babel/types" "^7.16.7"
-"@babel/helper-hoist-variables@^7.16.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
- integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
+"@babel/helper-get-function-arity@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
+ integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
dependencies:
- "@babel/types" "^7.16.0"
+ "@babel/types" "^7.16.7"
-"@babel/helper-split-export-declaration@^7.16.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
- integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==
+"@babel/helper-hoist-variables@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+ integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
dependencies:
- "@babel/types" "^7.16.0"
+ "@babel/types" "^7.16.7"
-"@babel/helper-validator-identifier@^7.15.7":
- version "7.15.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
- integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
-
-"@babel/highlight@^7.16.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
- integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
+"@babel/helper-split-export-declaration@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+ integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
dependencies:
- "@babel/helper-validator-identifier" "^7.15.7"
+ "@babel/types" "^7.16.7"
+
+"@babel/helper-validator-identifier@^7.16.7":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+ integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
+"@babel/highlight@^7.16.7":
+ version "7.16.10"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
+ integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.16.7"
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.4.3":
- version "7.16.4"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e"
- integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==
+"@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.4.3":
+ version "7.17.0"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
+ integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
-"@babel/template@^7.16.0", "@babel/template@^7.4.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
- integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
+"@babel/template@^7.16.7", "@babel/template@^7.4.0":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+ integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
dependencies:
- "@babel/code-frame" "^7.16.0"
- "@babel/parser" "^7.16.0"
- "@babel/types" "^7.16.0"
+ "@babel/code-frame" "^7.16.7"
+ "@babel/parser" "^7.16.7"
+ "@babel/types" "^7.16.7"
"@babel/traverse@^7.4.3":
- version "7.16.3"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787"
- integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==
+ version "7.17.0"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
+ integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
dependencies:
- "@babel/code-frame" "^7.16.0"
- "@babel/generator" "^7.16.0"
- "@babel/helper-function-name" "^7.16.0"
- "@babel/helper-hoist-variables" "^7.16.0"
- "@babel/helper-split-export-declaration" "^7.16.0"
- "@babel/parser" "^7.16.3"
- "@babel/types" "^7.16.0"
+ "@babel/code-frame" "^7.16.7"
+ "@babel/generator" "^7.17.0"
+ "@babel/helper-environment-visitor" "^7.16.7"
+ "@babel/helper-function-name" "^7.16.7"
+ "@babel/helper-hoist-variables" "^7.16.7"
+ "@babel/helper-split-export-declaration" "^7.16.7"
+ "@babel/parser" "^7.17.0"
+ "@babel/types" "^7.17.0"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.16.0", "@babel/types@^7.4.0":
- version "7.16.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
- integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
+"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.4.0":
+ version "7.17.0"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+ integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
dependencies:
- "@babel/helper-validator-identifier" "^7.15.7"
+ "@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"
"@mysql/xdevapi@*":
- version "8.0.27"
- resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.27.tgz#1e19335dee89d413c7ffbfd29340a92930d2e9c6"
- integrity sha512-8CVaCDxqXp6qDizxlO/GYPWv2NsYnXXPQygDHFH2rkow2Pi6zlYF7k+mIeRkH4KLZZQ+HZCfjJQkKB1kN5zTzg==
+ version "8.0.28"
+ resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.28.tgz#68f3b029e72ef8519e5aad7084ded2573af058b5"
+ integrity sha512-+plt6Ua6uVpV754w6QR2Lzg0iria7ynlaPPORM0YfiP6cabIAyanlnNmKkXmYR3eGc8kL3GW/zw4HJ2CIlnR6A==
dependencies:
google-protobuf "3.14.0"
parsimmon "1.16.0"
-"@sendgrid/client@^7.6.0":
- version "7.6.0"
- resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.0.tgz#f90cb8759c96e1d90224f29ad98f8fdc2be287f3"
- integrity sha512-cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==
+"@sendgrid/client@^7.6.1":
+ version "7.6.1"
+ resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz#de17fe9f04af3bdb69aca44fc407316de87cea3b"
+ integrity sha512-q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ==
dependencies:
"@sendgrid/helpers" "^7.6.0"
axios "^0.21.4"
@@ -123,11 +131,11 @@
deepmerge "^4.2.2"
"@sendgrid/mail@*":
- version "7.6.0"
- resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.0.tgz#e74ee30110527feab5d3b83d68af0cd94537f6d2"
- integrity sha512-0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==
+ version "7.6.1"
+ resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz#f7bbfc93781b0b6126549bf4b3649805295b02aa"
+ integrity sha512-F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg==
dependencies:
- "@sendgrid/client" "^7.6.0"
+ "@sendgrid/client" "^7.6.1"
"@sendgrid/helpers" "^7.6.0"
"@tootallnate/once@2":
@@ -140,22 +148,22 @@
resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
-"@types/ldapjs@^1.0.9":
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz#34077176af2b06186bd54e4a38ceb6e852387fa4"
- integrity sha512-O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ==
+"@types/ldapjs@^2.2.2":
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-2.2.2.tgz#cf79510d8dc34e5579442c2743f8a228427eb99c"
+ integrity sha512-U5HdnwIZ5uZa+f3usxdqgyfNmOROxOxXvQdQtsu6sKo8fte5vej9br2csHxPvXreAbAO1bs8/rdEzvCLpi67nQ==
dependencies:
"@types/node" "*"
"@types/node@*":
- version "16.11.12"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10"
- integrity sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==
+ version "17.0.17"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz#a8ddf6e0c2341718d74ee3dc413a13a042c45a0c"
+ integrity sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==
"@types/node@^14.14.14", "@types/node@^14.14.28":
- version "14.18.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a"
- integrity sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==
+ version "14.18.11"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz#9bd810a959e1728d78df0f68b5c825b8ea7156f4"
+ integrity sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg==
"@types/webidl-conversions@*":
version "6.1.1"
@@ -424,23 +432,23 @@ abstract-logging@^2.0.0:
integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==
accepts@~1.3.5, accepts@~1.3.7:
- version "1.3.7"
- resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
- integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+ version "1.3.8"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+ integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
dependencies:
- mime-types "~2.1.24"
- negotiator "0.6.2"
+ mime-types "~2.1.34"
+ negotiator "0.6.3"
acme-client@*:
- version "4.1.3"
- resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.1.3.tgz#2a37c7c8835da259eeb0cbfd8bcb7be3b9e4725b"
- integrity sha512-QL3F5us72ChCDsrSztGnTRo1HXBaOeptyUi6v2PNksZL728wZ3ZaxAST+QcfhAt2tOrr9Zl6zJorqS5vLBTtXA==
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.3.tgz#f789be89113dc6a656c7bd697fb72e08e52f6877"
+ integrity sha512-fzNysQ7OdBWPlELQbjjjLo2eqrmMpdd6DZ9/d4jxHJItpKC4GKYLTxA3UIYca9BcY4Zr8un/axyEGnyRHKLGbw==
dependencies:
- axios "0.21.1"
+ axios "0.21.4"
backo2 "^1.0.0"
bluebird "^3.5.0"
debug "^4.1.1"
- node-forge "^0.10.0"
+ node-forge "^1.2.0"
acorn-globals@^6.0.0:
version "6.0.0"
@@ -473,9 +481,9 @@ acorn@^7.1.1:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.5.0:
- version "8.6.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
- integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+ version "8.7.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+ integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
aedes-packet@^1.0.0:
version "1.0.0"
@@ -637,9 +645,9 @@ archiver-utils@^2.1.0:
readable-stream "^2.0.0"
archiver-zip-encrypted@*:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.10.tgz#4218a602b6088480703996808484fc1fc4a60a41"
- integrity sha512-Lrufx6UOithz1Z4C0PrwTsbF7qak/TDhMs3nAC/mFxV/tPKKaMhdjUgHV1UqRjcu2FaS8ghNexFVcNZ+CdFaXA==
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.11.tgz#43a7b9ebba56c6689132b58e556df13e6ddd5878"
+ integrity sha512-uXQzXSrZKW7TZ1g4BhfJFt1KjlKqY4SnCgDS6QhQKJoAriPXPKqhFQbvaIirWcR0pi5h3UF5Ktau7FVnS3AsGw==
dependencies:
aes-js "^3.1.2"
archiver "^5.3.0"
@@ -821,9 +829,9 @@ async@^2.0.1:
lodash "^4.17.14"
async@^3.2.0, async@~3.2.0:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd"
- integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
+ integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
asynckit@^0.4.0:
version "0.4.0"
@@ -845,20 +853,27 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-axios@0.21.1:
- version "0.21.1"
- resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
- integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
- dependencies:
- follow-redirects "^1.10.0"
-
-axios@^0.21.1, axios@^0.21.4:
+axios@0.21.4, axios@^0.21.1, axios@^0.21.4:
version "0.21.4"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
dependencies:
follow-redirects "^1.14.0"
+axios@^0.24.0:
+ version "0.24.0"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
+ integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+ dependencies:
+ follow-redirects "^1.14.4"
+
+axios@^0.25.0:
+ version "0.25.0"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+ integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+ dependencies:
+ follow-redirects "^1.14.7"
+
babel-cli@^6.16.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
@@ -1459,23 +1474,7 @@ bn.js@^4.0.0:
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-body-parser@1.19.0:
- version "1.19.0"
- resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
- integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
- dependencies:
- bytes "3.1.0"
- content-type "~1.0.4"
- debug "2.6.9"
- depd "~1.1.2"
- http-errors "1.7.2"
- iconv-lite "0.4.24"
- on-finished "~2.3.0"
- qs "6.7.0"
- raw-body "2.4.0"
- type-is "~1.6.17"
-
-body-parser@^1.19.0:
+body-parser@1.19.1, body-parser@^1.19.0:
version "1.19.1"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
@@ -1542,9 +1541,9 @@ bson@^1.1.4:
integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
bson@^4.4.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.0.tgz#15c3b39ba3940c3d915a0c44d51459f4b4fbf1b2"
- integrity sha512-8jw1NU1hglS+Da1jDOUYuNcBJ4cNHCFIqzlwoFNnsTOg2R/ox0aTYcTiBN4dzRa9q7Cvy6XErh3L8ReTEb9AQQ==
+ version "4.6.1"
+ resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.1.tgz#2b5da517539bb0f7f3ffb54ac70a384ca899641c"
+ integrity sha512-I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw==
dependencies:
buffer "^5.6.0"
@@ -1599,11 +1598,6 @@ bytes@3.0.0:
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-bytes@3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
- integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
bytes@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
@@ -2053,12 +2047,12 @@ config-master@^2.0.4:
feature-detect-es6 "^1.3.1"
walk-back "^2.0.1"
-content-disposition@0.5.3:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
- integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+content-disposition@0.5.4:
+ version "0.5.4"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+ integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
dependencies:
- safe-buffer "5.1.2"
+ safe-buffer "5.2.1"
content-type@~1.0.4:
version "1.0.4"
@@ -2086,10 +2080,10 @@ cookie-signature@1.0.6:
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-cookie@0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
- integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+cookie@0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+ integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
cookies@0.8.0:
version "0.8.0"
@@ -2138,12 +2132,12 @@ cpu-features@0.0.2:
nan "^2.14.1"
crc-32@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
- integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.1.tgz#436d2bcaad27bcb6bd073a2587139d3024a16460"
+ integrity sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==
dependencies:
exit-on-epipe "~1.0.1"
- printj "~1.1.0"
+ printj "~1.3.1"
crc32-stream@^3.0.1:
version "3.0.1"
@@ -2617,16 +2611,16 @@ express-ws@4.0.0:
ws "^5.2.0"
express@^4.17.0:
- version "4.17.1"
- resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
- integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+ version "4.17.2"
+ resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3"
+ integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==
dependencies:
accepts "~1.3.7"
array-flatten "1.1.1"
- body-parser "1.19.0"
- content-disposition "0.5.3"
+ body-parser "1.19.1"
+ content-disposition "0.5.4"
content-type "~1.0.4"
- cookie "0.4.0"
+ cookie "0.4.1"
cookie-signature "1.0.6"
debug "2.6.9"
depd "~1.1.2"
@@ -2640,13 +2634,13 @@ express@^4.17.0:
on-finished "~2.3.0"
parseurl "~1.3.3"
path-to-regexp "0.1.7"
- proxy-addr "~2.0.5"
- qs "6.7.0"
+ proxy-addr "~2.0.7"
+ qs "6.9.6"
range-parser "~1.2.1"
- safe-buffer "5.1.2"
- send "0.17.1"
- serve-static "1.14.1"
- setprototypeof "1.1.1"
+ safe-buffer "5.2.1"
+ send "0.17.2"
+ serve-static "1.14.2"
+ setprototypeof "1.2.0"
statuses "~1.5.0"
type-is "~1.6.18"
utils-merge "1.0.1"
@@ -2906,10 +2900,10 @@ flagged-respawn@^1.0.1:
resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-follow-redirects@^1.10.0, follow-redirects@^1.14.0:
- version "1.14.6"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
- integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
+follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7:
+ version "1.14.8"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+ integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
for-in@^1.0.1, for-in@^1.0.2:
version "1.0.2"
@@ -3178,9 +3172,9 @@ globals@^9.18.0:
integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
google-auth-library@^7.0.2:
- version "7.10.3"
- resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.3.tgz#e553683315b3095eebef3a8c019c09446cb75a3c"
- integrity sha512-VBwUCrjR+/p/J4ifSZRXG0XEc3Cm+2xnFrJi3A9DC2GzbCUK5j+R6CfqS7jyu1Hureb1PV53ZXZS1QV9PYUCrw==
+ version "7.12.0"
+ resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz#7965db6bc20cb31f2df05a08a296bbed6af69426"
+ integrity sha512-RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w==
dependencies:
arrify "^2.0.0"
base64-js "^1.3.0"
@@ -3192,12 +3186,12 @@ google-auth-library@^7.0.2:
jws "^4.0.0"
lru-cache "^6.0.0"
-google-p12-pem@^3.0.3:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz#c3d61c2da8e10843ff830fdb0d2059046238c1d4"
- integrity sha512-tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A==
+google-p12-pem@^3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.3.tgz#5497998798ee86c2fc1f4bb1f92b7729baf37537"
+ integrity sha512-MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ==
dependencies:
- node-forge "^0.10.0"
+ node-forge "^1.0.0"
google-protobuf@3.14.0:
version "3.14.0"
@@ -3217,17 +3211,17 @@ googleapis-common@^5.0.2:
uuid "^8.0.0"
googleapis@*:
- version "92.0.0"
- resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-92.0.0.tgz#291b9826a5a4509a9e9a6974ef942328857bfe18"
- integrity sha512-5HgJg7XvqEEJ+GO+2gvnzd5cAcDuSS/VB6nW7thoyj2GMq9nH4VvJwncSevinjLCnv06a+VSxrXNiL5vePHojA==
+ version "95.0.0"
+ resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz#63f6e28e78874044585f1e86c100a308a44fb385"
+ integrity sha512-ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA==
dependencies:
google-auth-library "^7.0.2"
googleapis-common "^5.0.2"
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
- version "4.2.8"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
- integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+ version "4.2.9"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+ integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
grunt-cli@~1.4.2:
version "1.4.3"
@@ -3305,12 +3299,12 @@ grunt@^1.0.1:
rimraf "~3.0.2"
gtoken@^5.0.4:
- version "5.3.1"
- resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz#c1c2598a826f2b5df7c6bb53d7be6cf6d50c3c78"
- integrity sha512-yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ==
+ version "5.3.2"
+ resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f"
+ integrity sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==
dependencies:
gaxios "^4.0.0"
- google-p12-pem "^3.0.3"
+ google-p12-pem "^3.1.3"
jws "^4.0.0"
handlebars-array@^0.2.0:
@@ -3528,18 +3522,7 @@ html-minifier@*:
relateurl "^0.2.7"
uglify-js "^3.5.1"
-http-errors@1.7.2:
- version "1.7.2"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
- integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.3"
- setprototypeof "1.1.1"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.0"
-
-http-errors@1.8.1, http-errors@~1.8.0:
+http-errors@1.8.1, http-errors@~1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
@@ -3550,17 +3533,6 @@ http-errors@1.8.1, http-errors@~1.8.0:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.1"
-http-errors@~1.7.2:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
- integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.4"
- setprototypeof "1.1.1"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.0"
-
http-proxy-agent@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
@@ -3619,9 +3591,9 @@ ieee754@^1.1.13:
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
image-size@*:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750"
- integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5"
+ integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==
dependencies:
queue "6.0.2"
@@ -3648,11 +3620,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-inherits@2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
ini@^1.3.4:
version "1.3.8"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -3724,10 +3691,10 @@ is-buffer@^1.1.5, is-buffer@~1.1.6:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-core-module@^2.2.0:
- version "2.8.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
- integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
+is-core-module@^2.8.1:
+ version "2.8.1"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+ integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
dependencies:
has "^1.0.3"
@@ -4317,11 +4284,11 @@ ldap-filter@^0.3.3:
assert-plus "^1.0.0"
ldapauth-fork@*:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz#18779a9c30371c5bbea02e3b6aaadb60819ad29c"
- integrity sha512-EdELQz8zgPruqV2y88PAuAiZCgTaMjex/kEA2PIcOlPYFt75C9QFt5HGZKVQo8Sf/3Mwnr1AtiThHKcq+pRtEg==
+ version "5.0.2"
+ resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.2.tgz#abe6a99eac578b7730e1331254643d78dffae6fa"
+ integrity sha512-fWrrBwJ162rzQIIqfPsfCHy/861kEalQNIu16gmwOMr5cmdfjNkw7XfTlzCTJHybnFg9oW9WaX4DGXa0xiGPmA==
dependencies:
- "@types/ldapjs" "^1.0.9"
+ "@types/ldapjs" "^2.2.2"
bcryptjs "^2.4.0"
ldapjs "^2.2.1"
lru-cache "^6.0.0"
@@ -4677,7 +4644,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2":
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
version "2.1.34"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -4717,9 +4684,9 @@ minimalistic-assert@^1.0.0:
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
"minimatch@2 || 3", minimatch@^3.0.4, minimatch@~3.0.4:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
- integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
+ integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
dependencies:
brace-expansion "^1.1.7"
@@ -4852,27 +4819,22 @@ ms@2.0.0:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-ms@2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
- integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
ms@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
multiparty@^4.2.1:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz#bee5fb5737247628d39dab4979ffd6d57bf60ef6"
- integrity sha512-NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q==
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz#6b14981badb5ad3f0929622868751810368d4633"
+ integrity sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==
dependencies:
- http-errors "~1.8.0"
+ http-errors "~1.8.1"
safe-buffer "5.2.1"
uid-safe "2.1.5"
@@ -4932,10 +4894,10 @@ ncp@~2.0.0:
resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
-negotiator@0.6.2:
- version "0.6.2"
- resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
- integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@0.6.3:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+ integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
neo-async@^2.6.0:
version "2.6.2"
@@ -4965,16 +4927,16 @@ node-addon-api@^1.7.1:
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
node-fetch@^2.3.0, node-fetch@^2.6.1:
- version "2.6.6"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
- integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+ version "2.6.7"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+ integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
dependencies:
whatwg-url "^5.0.0"
-node-forge@^0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
- integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+node-forge@^1.0.0, node-forge@^1.2.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
+ integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
node-rdpjs-2@*:
version "0.3.5"
@@ -5136,9 +5098,9 @@ object-get@^2.0.0, object-get@^2.0.2, object-get@^2.1.0:
integrity sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg==
object-inspect@^1.9.0:
- version "1.11.1"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b"
- integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==
+ version "1.12.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+ integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
@@ -5476,15 +5438,15 @@ passport-reddit@*:
pkginfo "0.3.x"
passport-saml@*:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.0.tgz#72ec8203df6dd872a205b8d5f578859a4e723e42"
- integrity sha512-EUzL+Wk8ZVdvOYhCBTkUrR1fwuMwF9za1FinFabP5Tl9qeJktsJWfoiBz7Fk6jQvpLwfnfryGdvwcOlGVct41A==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.1.tgz#c489a61a4c2dd93ddec1d53952a595b9f33e15e8"
+ integrity sha512-Y8aD94B6MTLht57BlBrDauEgvtWjuSeINKk7NadXlpT/OBmsoGGYPpb0FJeBtdyGX4GEbZARAkxvBEqsL8E7XQ==
dependencies:
"@xmldom/xmldom" "^0.7.5"
debug "^4.3.2"
passport-strategy "^1.0.0"
xml-crypto "^2.1.3"
- xml-encryption "^1.3.0"
+ xml-encryption "^2.0.0"
xml2js "^0.4.23"
xmlbuilder "^15.1.1"
@@ -5502,9 +5464,9 @@ passport-twitter@*:
xtraverse "0.1.x"
passport@*:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz#7914aaa55844f9dce8c3aa28f7d6b73647ee0169"
- integrity sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/passport/-/passport-0.5.2.tgz#0cb38dd8a71552c8390dfa6a9a6f7f3909954bcf"
+ integrity sha512-w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw==
dependencies:
passport-strategy "1.x.x"
pause "0.0.1"
@@ -5526,7 +5488,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-path-parse@^1.0.6:
+path-parse@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -5594,10 +5556,10 @@ pg-int8@1.0.1:
resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-pg-pool@^3.4.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c"
- integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==
+pg-pool@^3.4.1, pg-pool@^3.5.1:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905"
+ integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==
pg-protocol@^1.5.0:
version "1.5.0"
@@ -5615,7 +5577,7 @@ pg-types@^2.1.0:
postgres-date "~1.0.4"
postgres-interval "^1.1.0"
-pg@8.7.1, pg@^8.4.0:
+pg@8.7.1:
version "8.7.1"
resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471"
integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==
@@ -5628,12 +5590,25 @@ pg@8.7.1, pg@^8.4.0:
pg-types "^2.1.0"
pgpass "1.x"
-pgpass@1.x:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz#85eb93a83800b20f8057a2b029bf05abaf94ea9c"
- integrity sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==
+pg@^8.4.0:
+ version "8.7.3"
+ resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz#8a5bdd664ca4fda4db7997ec634c6e5455b27c44"
+ integrity sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==
dependencies:
- split2 "^3.1.1"
+ buffer-writer "2.0.0"
+ packet-reader "1.0.0"
+ pg-connection-string "^2.5.0"
+ pg-pool "^3.5.1"
+ pg-protocol "^1.5.0"
+ pg-types "^2.1.0"
+ pgpass "1.x"
+
+pgpass@1.x:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
+ integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
+ dependencies:
+ split2 "^4.1.0"
pgtools@0.3.2:
version "0.3.2"
@@ -5646,9 +5621,9 @@ pgtools@0.3.2:
yargs "^5.0.0"
picomatch@^2.2.3:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
- integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+ integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
pify@^2.0.0:
version "2.3.0"
@@ -5697,9 +5672,9 @@ please-upgrade-node@^3.2.0:
semver-compare "^1.0.0"
plivo@*:
- version "4.25.1"
- resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.25.1.tgz#ae33f216c58ebcce62c74ae3229d615b8f3ad382"
- integrity sha512-AaUxFqxanP855M5Pe2FQ6IGfNVtCXryvjqEso5crRCqPW7IGmNnSONift7RMaEiu4vMXPNjrSPYv5Wfo6UkR0A==
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz#af41278962b858bccf2bc04a9e28fd6008a0bd9a"
+ integrity sha512-bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw==
dependencies:
"@types/node" "^14.14.14"
axios "^0.21.1"
@@ -5762,10 +5737,10 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-printj@~1.1.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
- integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+printj@~1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz#9af6b1d55647a1587ac44f4c1654a4b95b8e12cb"
+ integrity sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==
private@^0.1.6, private@^0.1.8:
version "0.1.8"
@@ -5796,7 +5771,7 @@ promise@^8.0.2:
dependencies:
asap "~2.0.6"
-proxy-addr@~2.0.5:
+proxy-addr@~2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -5846,27 +5821,22 @@ qlobber@^3.0.2, qlobber@^3.1.0:
resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211"
integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug==
-qs@6.7.0:
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
- integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
qs@6.9.6:
version "6.9.6"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
qs@^6.6.0, qs@^6.7.0, qs@^6.9.4:
- version "6.10.2"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
- integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
+ version "6.10.3"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+ integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
dependencies:
side-channel "^1.0.4"
qs@~6.5.2:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
- integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+ integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
querystring@^0.2.0:
version "0.2.1"
@@ -5911,16 +5881,6 @@ range-parser@~1.2.1:
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-raw-body@2.4.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
- integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
- dependencies:
- bytes "3.1.0"
- http-errors "1.7.2"
- iconv-lite "0.4.24"
- unpipe "1.0.0"
-
raw-body@2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
@@ -5965,7 +5925,7 @@ read-pkg@^3.0.0:
normalize-package-data "^2.3.2"
path-type "^3.0.0"
-"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -6258,12 +6218,13 @@ resolve-url@^0.2.1:
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0:
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
- integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+ version "1.22.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+ integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
dependencies:
- is-core-module "^2.2.0"
- path-parse "^1.0.6"
+ is-core-module "^2.8.1"
+ path-parse "^1.0.7"
+ supports-preserve-symlinks-flag "^1.0.0"
ret@~0.1.10:
version "0.1.15"
@@ -6419,10 +6380,10 @@ semver@^6.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-send@0.17.1:
- version "0.17.1"
- resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
- integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+send@0.17.2:
+ version "0.17.2"
+ resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
+ integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
dependencies:
debug "2.6.9"
depd "~1.1.2"
@@ -6431,22 +6392,22 @@ send@0.17.1:
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
- http-errors "~1.7.2"
+ http-errors "1.8.1"
mime "1.6.0"
- ms "2.1.1"
+ ms "2.1.3"
on-finished "~2.3.0"
range-parser "~1.2.1"
statuses "~1.5.0"
-serve-static@1.14.1:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
- integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+serve-static@1.14.2:
+ version "1.14.2"
+ resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
+ integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
dependencies:
encodeurl "~1.0.2"
escape-html "~1.0.3"
parseurl "~1.3.3"
- send "0.17.1"
+ send "0.17.2"
set-blocking@^2.0.0:
version "2.0.0"
@@ -6463,11 +6424,6 @@ set-value@^2.0.0, set-value@^2.0.1:
is-plain-object "^2.0.3"
split-string "^3.0.1"
-setprototypeof@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
- integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
setprototypeof@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
@@ -6498,9 +6454,9 @@ side-channel@^1.0.4:
object-inspect "^1.9.0"
signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
- integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+ version "3.0.7"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+ integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
slash@^1.0.0:
version "1.0.0"
@@ -6638,14 +6594,12 @@ split-string@^3.0.1, split-string@^3.0.2:
dependencies:
extend-shallow "^3.0.0"
-split2@^3.1.1:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
- integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
- dependencies:
- readable-stream "^3.0.0"
+split2@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
+ integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==
-sprintf-js@^1.0.3:
+sprintf-js@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -6661,9 +6615,9 @@ sqlstring@2.3.1:
integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=
ssh2@*:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz#4dc559ba98a1cbb420e8d42998dfe35d0eda92bc"
- integrity sha512-iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA==
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz#61aebc3a6910fe488f9c85cd8355bdf8d4724e05"
+ integrity sha512-lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==
dependencies:
asn1 "^0.2.4"
bcrypt-pbkdf "^1.0.2"
@@ -6672,9 +6626,9 @@ ssh2@*:
nan "^2.15.0"
sshpk@^1.7.0:
- version "1.16.1"
- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
- integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+ version "1.17.0"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+ integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
dependencies:
asn1 "~0.2.3"
assert-plus "^1.0.0"
@@ -6833,6 +6787,11 @@ supports-color@^7.1.0:
dependencies:
has-flag "^4.0.0"
+supports-preserve-symlinks-flag@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+ integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
symbol-tree@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -6985,11 +6944,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
regex-not "^1.0.2"
safe-regex "^1.1.0"
-toidentifier@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
- integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
toidentifier@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -7072,11 +7026,11 @@ tweetnacl@^1.0.1:
integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
twilio@*:
- version "3.71.3"
- resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.71.3.tgz#a446d2b49f8c1ed60b0dd830c919921358c17203"
- integrity sha512-m9eda9fvkHxMMDHRtXj8WKI0ViP4EG4xS5au5ay3ScfModhBZ1ZtyfWZ0AfWI++A7a1T1j3ZVNIZ+AMLwxSffw==
+ version "3.74.0"
+ resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz#df912476543b7004cd765d566449c27174289091"
+ integrity sha512-r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A==
dependencies:
- axios "^0.21.4"
+ axios "^0.25.0"
dayjs "^1.8.29"
https-proxy-agent "^5.0.0"
jsonwebtoken "^8.5.1"
@@ -7095,7 +7049,7 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
-type-is@~1.6.17, type-is@~1.6.18:
+type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -7119,9 +7073,9 @@ uglify-js@^2.6:
uglify-to-browserify "~1.0.0"
uglify-js@^3.1.4, uglify-js@^3.5.1:
- version "3.14.5"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz#cdabb7d4954231d80cb4a927654c4655e51f4859"
- integrity sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==
+ version "3.15.1"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz#9403dc6fa5695a6172a91bc983ea39f0f7c9086d"
+ integrity sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==
uglify-to-browserify@~1.0.0:
version "1.0.2"
@@ -7146,17 +7100,17 @@ unc-path-regex@^0.1.2:
integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
underscore.string@~3.3.5:
- version "3.3.5"
- resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
- integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+ version "3.3.6"
+ resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"
+ integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==
dependencies:
- sprintf-js "^1.0.3"
+ sprintf-js "^1.1.1"
util-deprecate "^1.0.2"
underscore@^1.13.1:
- version "1.13.1"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
- integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
+ version "1.13.2"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881"
+ integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g==
underscore@~1.8.3:
version "1.8.3"
@@ -7219,9 +7173,9 @@ url-join@^4.0.1:
integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
url-parse@^1.5.3:
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
- integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+ version "1.5.4"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd"
+ integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==
dependencies:
querystringify "^2.1.1"
requires-port "^1.0.0"
@@ -7392,11 +7346,11 @@ web-push@*:
urlsafe-base64 "^1.0.0"
webdav@*:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz#3964c72c1d5dc9854c0031b43e464f260f22476e"
- integrity sha512-R1WZl/JeFPAmSEn1EPCmxSdPY8IxS/P0qnxAzBeRqEewpxVJ/UiCMJwXHLpyVsKYA1PIb1dYv+UTQsbNaQnLBw==
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.8.0.tgz#b5d7ebe46039d048c177fb021c9da591cf3ac6f0"
+ integrity sha512-CVJvxu0attEfoQUKraDiNh3uMjNPNl+BY0pbcKbyc/X+8IXDnqAT4tT4Ge12w+j49fYuVpFVkpEGwBZabv7Uhw==
dependencies:
- axios "^0.21.1"
+ axios "^0.24.0"
base-64 "^1.0.0"
fast-xml-parser "^3.19.0"
he "^1.2.0"
@@ -7579,14 +7533,14 @@ ws@5.2.3, ws@^5.2.0:
async-limiter "~1.0.0"
ws@^7.0.0:
- version "7.5.6"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
- integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+ version "7.5.7"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
+ integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
ws@^8.2.3:
- version "8.3.0"
- resolved "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d"
- integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+ integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
xml-crypto@^2.1.3:
version "2.1.3"
@@ -7596,14 +7550,13 @@ xml-crypto@^2.1.3:
"@xmldom/xmldom" "^0.7.0"
xpath "0.0.32"
-xml-encryption@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4"
- integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA==
+xml-encryption@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-2.0.0.tgz#d4e1eb3ec1f2c5d2a2a0a6e23d199237e8b4bf83"
+ integrity sha512-4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q==
dependencies:
"@xmldom/xmldom" "^0.7.0"
escape-html "^1.0.3"
- node-forge "^0.10.0"
xpath "0.0.32"
xml-name-validator@^4.0.0:
diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix
index 53a2c18c81a1..c9d5925b6580 100644
--- a/pkgs/tools/admin/meshcentral/yarn.nix
+++ b/pkgs/tools/admin/meshcentral/yarn.nix
@@ -2,115 +2,123 @@
offline_cache = linkFarm "offline" packages;
packages = [
{
- name = "_babel_code_frame___code_frame_7.16.0.tgz";
+ name = "_babel_code_frame___code_frame_7.16.7.tgz";
path = fetchurl {
- name = "_babel_code_frame___code_frame_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz";
- sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==";
+ name = "_babel_code_frame___code_frame_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz";
+ sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==";
};
}
{
- name = "_babel_generator___generator_7.16.0.tgz";
+ name = "_babel_generator___generator_7.17.0.tgz";
path = fetchurl {
- name = "_babel_generator___generator_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz";
- sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==";
+ name = "_babel_generator___generator_7.17.0.tgz";
+ url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz";
+ sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==";
};
}
{
- name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz";
+ name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz";
path = fetchurl {
- name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz";
- sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==";
+ name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz";
+ sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==";
};
}
{
- name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz";
+ name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz";
path = fetchurl {
- name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz";
- sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==";
+ name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz";
+ sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==";
};
}
{
- name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz";
+ name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz";
path = fetchurl {
- name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz";
- sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==";
+ name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz";
+ sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==";
};
}
{
- name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz";
+ name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz";
path = fetchurl {
- name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz";
- sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==";
+ name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz";
+ sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==";
};
}
{
- name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz";
+ name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz";
path = fetchurl {
- name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz";
- sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==";
+ name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz";
+ sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==";
};
}
{
- name = "_babel_highlight___highlight_7.16.0.tgz";
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz";
path = fetchurl {
- name = "_babel_highlight___highlight_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz";
- sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==";
+ name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz";
+ sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==";
};
}
{
- name = "_babel_parser___parser_7.16.4.tgz";
+ name = "_babel_highlight___highlight_7.16.10.tgz";
path = fetchurl {
- name = "_babel_parser___parser_7.16.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz";
- sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==";
+ name = "_babel_highlight___highlight_7.16.10.tgz";
+ url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz";
+ sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==";
};
}
{
- name = "_babel_template___template_7.16.0.tgz";
+ name = "_babel_parser___parser_7.17.0.tgz";
path = fetchurl {
- name = "_babel_template___template_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz";
- sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==";
+ name = "_babel_parser___parser_7.17.0.tgz";
+ url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz";
+ sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==";
};
}
{
- name = "_babel_traverse___traverse_7.16.3.tgz";
+ name = "_babel_template___template_7.16.7.tgz";
path = fetchurl {
- name = "_babel_traverse___traverse_7.16.3.tgz";
- url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz";
- sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==";
+ name = "_babel_template___template_7.16.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz";
+ sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==";
};
}
{
- name = "_babel_types___types_7.16.0.tgz";
+ name = "_babel_traverse___traverse_7.17.0.tgz";
path = fetchurl {
- name = "_babel_types___types_7.16.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz";
- sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==";
+ name = "_babel_traverse___traverse_7.17.0.tgz";
+ url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz";
+ sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==";
};
}
{
- name = "_mysql_xdevapi___xdevapi_8.0.27.tgz";
+ name = "_babel_types___types_7.17.0.tgz";
path = fetchurl {
- name = "_mysql_xdevapi___xdevapi_8.0.27.tgz";
- url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.27.tgz";
- sha512 = "8CVaCDxqXp6qDizxlO/GYPWv2NsYnXXPQygDHFH2rkow2Pi6zlYF7k+mIeRkH4KLZZQ+HZCfjJQkKB1kN5zTzg==";
+ name = "_babel_types___types_7.17.0.tgz";
+ url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz";
+ sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==";
};
}
{
- name = "_sendgrid_client___client_7.6.0.tgz";
+ name = "_mysql_xdevapi___xdevapi_8.0.28.tgz";
path = fetchurl {
- name = "_sendgrid_client___client_7.6.0.tgz";
- url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.0.tgz";
- sha512 = "cpBVZKLlMTO+vpE18krTixubYmZa98oTbLkqBDuTiA3zRkW+urrxg7pDR24TkI35Mid0Zru8jDHwnOiqrXu0TA==";
+ name = "_mysql_xdevapi___xdevapi_8.0.28.tgz";
+ url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.28.tgz";
+ sha512 = "+plt6Ua6uVpV754w6QR2Lzg0iria7ynlaPPORM0YfiP6cabIAyanlnNmKkXmYR3eGc8kL3GW/zw4HJ2CIlnR6A==";
+ };
+ }
+ {
+ name = "_sendgrid_client___client_7.6.1.tgz";
+ path = fetchurl {
+ name = "_sendgrid_client___client_7.6.1.tgz";
+ url = "https://registry.yarnpkg.com/@sendgrid/client/-/client-7.6.1.tgz";
+ sha512 = "q4U5OhcbJjs+lLVv/LhZSc28feiVCFMgvG9aYcRI5X4tKArnrrGDWb5HMITR9vaAtX42TXhyPFjHr1fk/Q1loQ==";
};
}
{
@@ -122,11 +130,11 @@
};
}
{
- name = "_sendgrid_mail___mail_7.6.0.tgz";
+ name = "_sendgrid_mail___mail_7.6.1.tgz";
path = fetchurl {
- name = "_sendgrid_mail___mail_7.6.0.tgz";
- url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.0.tgz";
- sha512 = "0KdaSZzflJD/vUAZjB3ALBIuaVGoLq22hrb2fvQXZHRepU/yhRNlEOqrr05MfKBnKskzq1blnD1J0fHxiwaolw==";
+ name = "_sendgrid_mail___mail_7.6.1.tgz";
+ url = "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-7.6.1.tgz";
+ sha512 = "F+HXpDLIU4PGZyZznOiFLDGJDwLn2qh7/wD5MvwurrldDx5DaGQHrYBKHopceOl15FVuq9ElU9VIxQJF8SMvTg==";
};
}
{
@@ -146,27 +154,27 @@
};
}
{
- name = "_types_ldapjs___ldapjs_1.0.11.tgz";
+ name = "_types_ldapjs___ldapjs_2.2.2.tgz";
path = fetchurl {
- name = "_types_ldapjs___ldapjs_1.0.11.tgz";
- url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz";
- sha512 = "O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ==";
+ name = "_types_ldapjs___ldapjs_2.2.2.tgz";
+ url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-2.2.2.tgz";
+ sha512 = "U5HdnwIZ5uZa+f3usxdqgyfNmOROxOxXvQdQtsu6sKo8fte5vej9br2csHxPvXreAbAO1bs8/rdEzvCLpi67nQ==";
};
}
{
- name = "_types_node___node_16.11.12.tgz";
+ name = "_types_node___node_17.0.17.tgz";
path = fetchurl {
- name = "_types_node___node_16.11.12.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz";
- sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==";
+ name = "_types_node___node_17.0.17.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.17.tgz";
+ sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==";
};
}
{
- name = "_types_node___node_14.18.0.tgz";
+ name = "_types_node___node_14.18.11.tgz";
path = fetchurl {
- name = "_types_node___node_14.18.0.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz";
- sha512 = "0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==";
+ name = "_types_node___node_14.18.11.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz";
+ sha512 = "zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg==";
};
}
{
@@ -450,19 +458,19 @@
};
}
{
- name = "accepts___accepts_1.3.7.tgz";
+ name = "accepts___accepts_1.3.8.tgz";
path = fetchurl {
- name = "accepts___accepts_1.3.7.tgz";
- url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz";
- sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+ name = "accepts___accepts_1.3.8.tgz";
+ url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz";
+ sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
};
}
{
- name = "acme_client___acme_client_4.1.3.tgz";
+ name = "acme_client___acme_client_4.2.3.tgz";
path = fetchurl {
- name = "acme_client___acme_client_4.1.3.tgz";
- url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.1.3.tgz";
- sha512 = "QL3F5us72ChCDsrSztGnTRo1HXBaOeptyUi6v2PNksZL728wZ3ZaxAST+QcfhAt2tOrr9Zl6zJorqS5vLBTtXA==";
+ name = "acme_client___acme_client_4.2.3.tgz";
+ url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.3.tgz";
+ sha512 = "fzNysQ7OdBWPlELQbjjjLo2eqrmMpdd6DZ9/d4jxHJItpKC4GKYLTxA3UIYca9BcY4Zr8un/axyEGnyRHKLGbw==";
};
}
{
@@ -506,11 +514,11 @@
};
}
{
- name = "acorn___acorn_8.6.0.tgz";
+ name = "acorn___acorn_8.7.0.tgz";
path = fetchurl {
- name = "acorn___acorn_8.6.0.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz";
- sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==";
+ name = "acorn___acorn_8.7.0.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz";
+ sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==";
};
}
{
@@ -666,11 +674,11 @@
};
}
{
- name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.10.tgz";
+ name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.11.tgz";
path = fetchurl {
- name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.10.tgz";
- url = "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.10.tgz";
- sha512 = "Lrufx6UOithz1Z4C0PrwTsbF7qak/TDhMs3nAC/mFxV/tPKKaMhdjUgHV1UqRjcu2FaS8ghNexFVcNZ+CdFaXA==";
+ name = "archiver_zip_encrypted___archiver_zip_encrypted_1.0.11.tgz";
+ url = "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-1.0.11.tgz";
+ sha512 = "uXQzXSrZKW7TZ1g4BhfJFt1KjlKqY4SnCgDS6QhQKJoAriPXPKqhFQbvaIirWcR0pi5h3UF5Ktau7FVnS3AsGw==";
};
}
{
@@ -874,11 +882,11 @@
};
}
{
- name = "async___async_3.2.2.tgz";
+ name = "async___async_3.2.3.tgz";
path = fetchurl {
- name = "async___async_3.2.2.tgz";
- url = "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz";
- sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==";
+ name = "async___async_3.2.3.tgz";
+ url = "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz";
+ sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==";
};
}
{
@@ -913,14 +921,6 @@
sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
};
}
- {
- name = "axios___axios_0.21.1.tgz";
- path = fetchurl {
- name = "axios___axios_0.21.1.tgz";
- url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz";
- sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
- };
- }
{
name = "axios___axios_0.21.4.tgz";
path = fetchurl {
@@ -929,6 +929,22 @@
sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==";
};
}
+ {
+ name = "axios___axios_0.24.0.tgz";
+ path = fetchurl {
+ name = "axios___axios_0.24.0.tgz";
+ url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz";
+ sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==";
+ };
+ }
+ {
+ name = "axios___axios_0.25.0.tgz";
+ path = fetchurl {
+ name = "axios___axios_0.25.0.tgz";
+ url = "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz";
+ sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==";
+ };
+ }
{
name = "babel_cli___babel_cli_6.26.0.tgz";
path = fetchurl {
@@ -1473,14 +1489,6 @@
sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==";
};
}
- {
- name = "body_parser___body_parser_1.19.0.tgz";
- path = fetchurl {
- name = "body_parser___body_parser_1.19.0.tgz";
- url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz";
- sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
- };
- }
{
name = "body_parser___body_parser_1.19.1.tgz";
path = fetchurl {
@@ -1538,11 +1546,11 @@
};
}
{
- name = "bson___bson_4.6.0.tgz";
+ name = "bson___bson_4.6.1.tgz";
path = fetchurl {
- name = "bson___bson_4.6.0.tgz";
- url = "https://registry.yarnpkg.com/bson/-/bson-4.6.0.tgz";
- sha512 = "8jw1NU1hglS+Da1jDOUYuNcBJ4cNHCFIqzlwoFNnsTOg2R/ox0aTYcTiBN4dzRa9q7Cvy6XErh3L8ReTEb9AQQ==";
+ name = "bson___bson_4.6.1.tgz";
+ url = "https://registry.yarnpkg.com/bson/-/bson-4.6.1.tgz";
+ sha512 = "I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw==";
};
}
{
@@ -1609,14 +1617,6 @@
sha1 = "0ygVQE1olpn4Wk6k+odV3ROpYEg=";
};
}
- {
- name = "bytes___bytes_3.1.0.tgz";
- path = fetchurl {
- name = "bytes___bytes_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz";
- sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
- };
- }
{
name = "bytes___bytes_3.1.1.tgz";
path = fetchurl {
@@ -2050,11 +2050,11 @@
};
}
{
- name = "content_disposition___content_disposition_0.5.3.tgz";
+ name = "content_disposition___content_disposition_0.5.4.tgz";
path = fetchurl {
- name = "content_disposition___content_disposition_0.5.3.tgz";
- url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz";
- sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==";
+ name = "content_disposition___content_disposition_0.5.4.tgz";
+ url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz";
+ sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==";
};
}
{
@@ -2090,11 +2090,11 @@
};
}
{
- name = "cookie___cookie_0.4.0.tgz";
+ name = "cookie___cookie_0.4.1.tgz";
path = fetchurl {
- name = "cookie___cookie_0.4.0.tgz";
- url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz";
- sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
+ name = "cookie___cookie_0.4.1.tgz";
+ url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz";
+ sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
};
}
{
@@ -2154,11 +2154,11 @@
};
}
{
- name = "crc_32___crc_32_1.2.0.tgz";
+ name = "crc_32___crc_32_1.2.1.tgz";
path = fetchurl {
- name = "crc_32___crc_32_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz";
- sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==";
+ name = "crc_32___crc_32_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.1.tgz";
+ sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==";
};
}
{
@@ -2714,11 +2714,11 @@
};
}
{
- name = "express___express_4.17.1.tgz";
+ name = "express___express_4.17.2.tgz";
path = fetchurl {
- name = "express___express_4.17.1.tgz";
- url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz";
- sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
+ name = "express___express_4.17.2.tgz";
+ url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz";
+ sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==";
};
}
{
@@ -2994,11 +2994,11 @@
};
}
{
- name = "follow_redirects___follow_redirects_1.14.6.tgz";
+ name = "follow_redirects___follow_redirects_1.14.8.tgz";
path = fetchurl {
- name = "follow_redirects___follow_redirects_1.14.6.tgz";
- url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz";
- sha512 = "fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==";
+ name = "follow_redirects___follow_redirects_1.14.8.tgz";
+ url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz";
+ sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==";
};
}
{
@@ -3290,19 +3290,19 @@
};
}
{
- name = "google_auth_library___google_auth_library_7.10.3.tgz";
+ name = "google_auth_library___google_auth_library_7.12.0.tgz";
path = fetchurl {
- name = "google_auth_library___google_auth_library_7.10.3.tgz";
- url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.3.tgz";
- sha512 = "VBwUCrjR+/p/J4ifSZRXG0XEc3Cm+2xnFrJi3A9DC2GzbCUK5j+R6CfqS7jyu1Hureb1PV53ZXZS1QV9PYUCrw==";
+ name = "google_auth_library___google_auth_library_7.12.0.tgz";
+ url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.12.0.tgz";
+ sha512 = "RS/whvFPMoF1hQNxnoVET3DWKPBt1Xgqe2rY0k+Jn7TNhoHlwdnSe7Rlcbo2Nub3Mt2lUVz26X65aDQrWp6x8w==";
};
}
{
- name = "google_p12_pem___google_p12_pem_3.1.2.tgz";
+ name = "google_p12_pem___google_p12_pem_3.1.3.tgz";
path = fetchurl {
- name = "google_p12_pem___google_p12_pem_3.1.2.tgz";
- url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.2.tgz";
- sha512 = "tjf3IQIt7tWCDsa0ofDQ1qqSCNzahXDxdAGJDbruWqu3eCg5CKLYKN+hi0s6lfvzYZ1GDVr+oDF9OOWlDSdf0A==";
+ name = "google_p12_pem___google_p12_pem_3.1.3.tgz";
+ url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.3.tgz";
+ sha512 = "MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ==";
};
}
{
@@ -3322,19 +3322,19 @@
};
}
{
- name = "googleapis___googleapis_92.0.0.tgz";
+ name = "googleapis___googleapis_95.0.0.tgz";
path = fetchurl {
- name = "googleapis___googleapis_92.0.0.tgz";
- url = "https://registry.yarnpkg.com/googleapis/-/googleapis-92.0.0.tgz";
- sha512 = "5HgJg7XvqEEJ+GO+2gvnzd5cAcDuSS/VB6nW7thoyj2GMq9nH4VvJwncSevinjLCnv06a+VSxrXNiL5vePHojA==";
+ name = "googleapis___googleapis_95.0.0.tgz";
+ url = "https://registry.yarnpkg.com/googleapis/-/googleapis-95.0.0.tgz";
+ sha512 = "ZpFZW7FDwcjQa2+xZNS2SC5sK2s46iWKA5QSFVJSK3RELQec4PYHhzKwzbeCzt4urnjYp6udPif95zXTFxbtRA==";
};
}
{
- name = "graceful_fs___graceful_fs_4.2.8.tgz";
+ name = "graceful_fs___graceful_fs_4.2.9.tgz";
path = fetchurl {
- name = "graceful_fs___graceful_fs_4.2.8.tgz";
- url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz";
- sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
+ name = "graceful_fs___graceful_fs_4.2.9.tgz";
+ url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz";
+ sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
};
}
{
@@ -3394,11 +3394,11 @@
};
}
{
- name = "gtoken___gtoken_5.3.1.tgz";
+ name = "gtoken___gtoken_5.3.2.tgz";
path = fetchurl {
- name = "gtoken___gtoken_5.3.1.tgz";
- url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.1.tgz";
- sha512 = "yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ==";
+ name = "gtoken___gtoken_5.3.2.tgz";
+ url = "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz";
+ sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==";
};
}
{
@@ -3649,14 +3649,6 @@
sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==";
};
}
- {
- name = "http_errors___http_errors_1.7.2.tgz";
- path = fetchurl {
- name = "http_errors___http_errors_1.7.2.tgz";
- url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz";
- sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
- };
- }
{
name = "http_errors___http_errors_1.8.1.tgz";
path = fetchurl {
@@ -3665,14 +3657,6 @@
sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==";
};
}
- {
- name = "http_errors___http_errors_1.7.3.tgz";
- path = fetchurl {
- name = "http_errors___http_errors_1.7.3.tgz";
- url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz";
- sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
- };
- }
{
name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz";
path = fetchurl {
@@ -3738,11 +3722,11 @@
};
}
{
- name = "image_size___image_size_1.0.0.tgz";
+ name = "image_size___image_size_1.0.1.tgz";
path = fetchurl {
- name = "image_size___image_size_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz";
- sha512 = "JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==";
+ name = "image_size___image_size_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz";
+ sha512 = "VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==";
};
}
{
@@ -3777,14 +3761,6 @@
sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
};
}
- {
- name = "inherits___inherits_2.0.3.tgz";
- path = fetchurl {
- name = "inherits___inherits_2.0.3.tgz";
- url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
- sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4=";
- };
- }
{
name = "ini___ini_1.3.8.tgz";
path = fetchurl {
@@ -3882,11 +3858,11 @@
};
}
{
- name = "is_core_module___is_core_module_2.8.0.tgz";
+ name = "is_core_module___is_core_module_2.8.1.tgz";
path = fetchurl {
- name = "is_core_module___is_core_module_2.8.0.tgz";
- url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz";
- sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==";
+ name = "is_core_module___is_core_module_2.8.1.tgz";
+ url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz";
+ sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==";
};
}
{
@@ -4530,11 +4506,11 @@
};
}
{
- name = "ldapauth_fork___ldapauth_fork_5.0.1.tgz";
+ name = "ldapauth_fork___ldapauth_fork_5.0.2.tgz";
path = fetchurl {
- name = "ldapauth_fork___ldapauth_fork_5.0.1.tgz";
- url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz";
- sha512 = "EdELQz8zgPruqV2y88PAuAiZCgTaMjex/kEA2PIcOlPYFt75C9QFt5HGZKVQo8Sf/3Mwnr1AtiThHKcq+pRtEg==";
+ name = "ldapauth_fork___ldapauth_fork_5.0.2.tgz";
+ url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.2.tgz";
+ sha512 = "fWrrBwJ162rzQIIqfPsfCHy/861kEalQNIu16gmwOMr5cmdfjNkw7XfTlzCTJHybnFg9oW9WaX4DGXa0xiGPmA==";
};
}
{
@@ -4970,11 +4946,11 @@
};
}
{
- name = "minimatch___minimatch_3.0.4.tgz";
+ name = "minimatch___minimatch_3.0.5.tgz";
path = fetchurl {
- name = "minimatch___minimatch_3.0.4.tgz";
- url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz";
- sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+ name = "minimatch___minimatch_3.0.5.tgz";
+ url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz";
+ sha512 = "tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==";
};
}
{
@@ -5113,14 +5089,6 @@
sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g=";
};
}
- {
- name = "ms___ms_2.1.1.tgz";
- path = fetchurl {
- name = "ms___ms_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz";
- sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
- };
- }
{
name = "ms___ms_2.1.2.tgz";
path = fetchurl {
@@ -5138,11 +5106,11 @@
};
}
{
- name = "multiparty___multiparty_4.2.2.tgz";
+ name = "multiparty___multiparty_4.2.3.tgz";
path = fetchurl {
- name = "multiparty___multiparty_4.2.2.tgz";
- url = "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.2.tgz";
- sha512 = "NtZLjlvsjcoGrzojtwQwn/Tm90aWJ6XXtPppYF4WmOk/6ncdwMMKggFY2NlRRN9yiCEIVxpOfPWahVEG2HAG8Q==";
+ name = "multiparty___multiparty_4.2.3.tgz";
+ url = "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz";
+ sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==";
};
}
{
@@ -5202,11 +5170,11 @@
};
}
{
- name = "negotiator___negotiator_0.6.2.tgz";
+ name = "negotiator___negotiator_0.6.3.tgz";
path = fetchurl {
- name = "negotiator___negotiator_0.6.2.tgz";
- url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz";
- sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+ name = "negotiator___negotiator_0.6.3.tgz";
+ url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz";
+ sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
};
}
{
@@ -5250,19 +5218,19 @@
};
}
{
- name = "node_fetch___node_fetch_2.6.6.tgz";
+ name = "node_fetch___node_fetch_2.6.7.tgz";
path = fetchurl {
- name = "node_fetch___node_fetch_2.6.6.tgz";
- url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz";
- sha512 = "Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==";
+ name = "node_fetch___node_fetch_2.6.7.tgz";
+ url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz";
+ sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==";
};
}
{
- name = "node_forge___node_forge_0.10.0.tgz";
+ name = "node_forge___node_forge_1.2.1.tgz";
path = fetchurl {
- name = "node_forge___node_forge_0.10.0.tgz";
- url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz";
- sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==";
+ name = "node_forge___node_forge_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz";
+ sha512 = "Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==";
};
}
{
@@ -5426,11 +5394,11 @@
};
}
{
- name = "object_inspect___object_inspect_1.11.1.tgz";
+ name = "object_inspect___object_inspect_1.12.0.tgz";
path = fetchurl {
- name = "object_inspect___object_inspect_1.11.1.tgz";
- url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz";
- sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==";
+ name = "object_inspect___object_inspect_1.12.0.tgz";
+ url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz";
+ sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==";
};
}
{
@@ -5802,11 +5770,11 @@
};
}
{
- name = "passport_saml___passport_saml_3.2.0.tgz";
+ name = "passport_saml___passport_saml_3.2.1.tgz";
path = fetchurl {
- name = "passport_saml___passport_saml_3.2.0.tgz";
- url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.0.tgz";
- sha512 = "EUzL+Wk8ZVdvOYhCBTkUrR1fwuMwF9za1FinFabP5Tl9qeJktsJWfoiBz7Fk6jQvpLwfnfryGdvwcOlGVct41A==";
+ name = "passport_saml___passport_saml_3.2.1.tgz";
+ url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.1.tgz";
+ sha512 = "Y8aD94B6MTLht57BlBrDauEgvtWjuSeINKk7NadXlpT/OBmsoGGYPpb0FJeBtdyGX4GEbZARAkxvBEqsL8E7XQ==";
};
}
{
@@ -5826,11 +5794,11 @@
};
}
{
- name = "passport___passport_0.5.0.tgz";
+ name = "passport___passport_0.5.2.tgz";
path = fetchurl {
- name = "passport___passport_0.5.0.tgz";
- url = "https://registry.yarnpkg.com/passport/-/passport-0.5.0.tgz";
- sha512 = "ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==";
+ name = "passport___passport_0.5.2.tgz";
+ url = "https://registry.yarnpkg.com/passport/-/passport-0.5.2.tgz";
+ sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw==";
};
}
{
@@ -5954,11 +5922,11 @@
};
}
{
- name = "pg_pool___pg_pool_3.4.1.tgz";
+ name = "pg_pool___pg_pool_3.5.1.tgz";
path = fetchurl {
- name = "pg_pool___pg_pool_3.4.1.tgz";
- url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz";
- sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==";
+ name = "pg_pool___pg_pool_3.5.1.tgz";
+ url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz";
+ sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==";
};
}
{
@@ -5986,11 +5954,19 @@
};
}
{
- name = "pgpass___pgpass_1.0.4.tgz";
+ name = "pg___pg_8.7.3.tgz";
path = fetchurl {
- name = "pgpass___pgpass_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz";
- sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==";
+ name = "pg___pg_8.7.3.tgz";
+ url = "https://registry.yarnpkg.com/pg/-/pg-8.7.3.tgz";
+ sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==";
+ };
+ }
+ {
+ name = "pgpass___pgpass_1.0.5.tgz";
+ path = fetchurl {
+ name = "pgpass___pgpass_1.0.5.tgz";
+ url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz";
+ sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==";
};
}
{
@@ -6002,11 +5978,11 @@
};
}
{
- name = "picomatch___picomatch_2.3.0.tgz";
+ name = "picomatch___picomatch_2.3.1.tgz";
path = fetchurl {
- name = "picomatch___picomatch_2.3.0.tgz";
- url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz";
- sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==";
+ name = "picomatch___picomatch_2.3.1.tgz";
+ url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz";
+ sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==";
};
}
{
@@ -6074,11 +6050,11 @@
};
}
{
- name = "plivo___plivo_4.25.1.tgz";
+ name = "plivo___plivo_4.27.0.tgz";
path = fetchurl {
- name = "plivo___plivo_4.25.1.tgz";
- url = "https://registry.yarnpkg.com/plivo/-/plivo-4.25.1.tgz";
- sha512 = "AaUxFqxanP855M5Pe2FQ6IGfNVtCXryvjqEso5crRCqPW7IGmNnSONift7RMaEiu4vMXPNjrSPYv5Wfo6UkR0A==";
+ name = "plivo___plivo_4.27.0.tgz";
+ url = "https://registry.yarnpkg.com/plivo/-/plivo-4.27.0.tgz";
+ sha512 = "bmtc/GSQsxBW5aarr8z8lS07vl4HWtgTZTb8W5/dfsm9Z3dG3VDswkFIeu+n0ZkJ+FEbVGPkCV4EJ7jfRA+2Cw==";
};
}
{
@@ -6154,11 +6130,11 @@
};
}
{
- name = "printj___printj_1.1.2.tgz";
+ name = "printj___printj_1.3.1.tgz";
path = fetchurl {
- name = "printj___printj_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz";
- sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
+ name = "printj___printj_1.3.1.tgz";
+ url = "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz";
+ sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==";
};
}
{
@@ -6265,14 +6241,6 @@
sha512 = "B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug==";
};
}
- {
- name = "qs___qs_6.7.0.tgz";
- path = fetchurl {
- name = "qs___qs_6.7.0.tgz";
- url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz";
- sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
- };
- }
{
name = "qs___qs_6.9.6.tgz";
path = fetchurl {
@@ -6282,19 +6250,19 @@
};
}
{
- name = "qs___qs_6.10.2.tgz";
+ name = "qs___qs_6.10.3.tgz";
path = fetchurl {
- name = "qs___qs_6.10.2.tgz";
- url = "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz";
- sha512 = "mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==";
+ name = "qs___qs_6.10.3.tgz";
+ url = "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz";
+ sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==";
};
}
{
- name = "qs___qs_6.5.2.tgz";
+ name = "qs___qs_6.5.3.tgz";
path = fetchurl {
- name = "qs___qs_6.5.2.tgz";
- url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz";
- sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+ name = "qs___qs_6.5.3.tgz";
+ url = "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz";
+ sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
};
}
{
@@ -6353,14 +6321,6 @@
sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
};
}
- {
- name = "raw_body___raw_body_2.4.0.tgz";
- path = fetchurl {
- name = "raw_body___raw_body_2.4.0.tgz";
- url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz";
- sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
- };
- }
{
name = "raw_body___raw_body_2.4.2.tgz";
path = fetchurl {
@@ -6706,11 +6666,11 @@
};
}
{
- name = "resolve___resolve_1.20.0.tgz";
+ name = "resolve___resolve_1.22.0.tgz";
path = fetchurl {
- name = "resolve___resolve_1.20.0.tgz";
- url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz";
- sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==";
+ name = "resolve___resolve_1.22.0.tgz";
+ url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz";
+ sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==";
};
}
{
@@ -6922,19 +6882,19 @@
};
}
{
- name = "send___send_0.17.1.tgz";
+ name = "send___send_0.17.2.tgz";
path = fetchurl {
- name = "send___send_0.17.1.tgz";
- url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz";
- sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
+ name = "send___send_0.17.2.tgz";
+ url = "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz";
+ sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==";
};
}
{
- name = "serve_static___serve_static_1.14.1.tgz";
+ name = "serve_static___serve_static_1.14.2.tgz";
path = fetchurl {
- name = "serve_static___serve_static_1.14.1.tgz";
- url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz";
- sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==";
+ name = "serve_static___serve_static_1.14.2.tgz";
+ url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz";
+ sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==";
};
}
{
@@ -6953,14 +6913,6 @@
sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==";
};
}
- {
- name = "setprototypeof___setprototypeof_1.1.1.tgz";
- path = fetchurl {
- name = "setprototypeof___setprototypeof_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz";
- sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
- };
- }
{
name = "setprototypeof___setprototypeof_1.2.0.tgz";
path = fetchurl {
@@ -6994,11 +6946,11 @@
};
}
{
- name = "signal_exit___signal_exit_3.0.6.tgz";
+ name = "signal_exit___signal_exit_3.0.7.tgz";
path = fetchurl {
- name = "signal_exit___signal_exit_3.0.6.tgz";
- url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz";
- sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==";
+ name = "signal_exit___signal_exit_3.0.7.tgz";
+ url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz";
+ sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
};
}
{
@@ -7146,11 +7098,11 @@
};
}
{
- name = "split2___split2_3.2.2.tgz";
+ name = "split2___split2_4.1.0.tgz";
path = fetchurl {
- name = "split2___split2_3.2.2.tgz";
- url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz";
- sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==";
+ name = "split2___split2_4.1.0.tgz";
+ url = "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz";
+ sha512 = "VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==";
};
}
{
@@ -7178,19 +7130,19 @@
};
}
{
- name = "ssh2___ssh2_1.5.0.tgz";
+ name = "ssh2___ssh2_1.6.0.tgz";
path = fetchurl {
- name = "ssh2___ssh2_1.5.0.tgz";
- url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz";
- sha512 = "iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA==";
+ name = "ssh2___ssh2_1.6.0.tgz";
+ url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.6.0.tgz";
+ sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==";
};
}
{
- name = "sshpk___sshpk_1.16.1.tgz";
+ name = "sshpk___sshpk_1.17.0.tgz";
path = fetchurl {
- name = "sshpk___sshpk_1.16.1.tgz";
- url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz";
- sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
+ name = "sshpk___sshpk_1.17.0.tgz";
+ url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz";
+ sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==";
};
}
{
@@ -7377,6 +7329,14 @@
sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
};
}
+ {
+ name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
+ path = fetchurl {
+ name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz";
+ sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==";
+ };
+ }
{
name = "symbol_tree___symbol_tree_3.2.4.tgz";
path = fetchurl {
@@ -7545,14 +7505,6 @@
sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
};
}
- {
- name = "toidentifier___toidentifier_1.0.0.tgz";
- path = fetchurl {
- name = "toidentifier___toidentifier_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz";
- sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
- };
- }
{
name = "toidentifier___toidentifier_1.0.1.tgz";
path = fetchurl {
@@ -7658,11 +7610,11 @@
};
}
{
- name = "twilio___twilio_3.71.3.tgz";
+ name = "twilio___twilio_3.74.0.tgz";
path = fetchurl {
- name = "twilio___twilio_3.71.3.tgz";
- url = "https://registry.yarnpkg.com/twilio/-/twilio-3.71.3.tgz";
- sha512 = "m9eda9fvkHxMMDHRtXj8WKI0ViP4EG4xS5au5ay3ScfModhBZ1ZtyfWZ0AfWI++A7a1T1j3ZVNIZ+AMLwxSffw==";
+ name = "twilio___twilio_3.74.0.tgz";
+ url = "https://registry.yarnpkg.com/twilio/-/twilio-3.74.0.tgz";
+ sha512 = "r79CWIug+x2/1uGOdAzGESvUvycxPCvVJ9rm4y1TsAocshTh+f5+ipULxyT3T5q4wJNT+k2OEiUBkKFA+cpQ/A==";
};
}
{
@@ -7698,11 +7650,11 @@
};
}
{
- name = "uglify_js___uglify_js_3.14.5.tgz";
+ name = "uglify_js___uglify_js_3.15.1.tgz";
path = fetchurl {
- name = "uglify_js___uglify_js_3.14.5.tgz";
- url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz";
- sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==";
+ name = "uglify_js___uglify_js_3.15.1.tgz";
+ url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.1.tgz";
+ sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==";
};
}
{
@@ -7738,19 +7690,19 @@
};
}
{
- name = "underscore.string___underscore.string_3.3.5.tgz";
+ name = "underscore.string___underscore.string_3.3.6.tgz";
path = fetchurl {
- name = "underscore.string___underscore.string_3.3.5.tgz";
- url = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz";
- sha512 = "g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==";
+ name = "underscore.string___underscore.string_3.3.6.tgz";
+ url = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz";
+ sha512 = "VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==";
};
}
{
- name = "underscore___underscore_1.13.1.tgz";
+ name = "underscore___underscore_1.13.2.tgz";
path = fetchurl {
- name = "underscore___underscore_1.13.1.tgz";
- url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz";
- sha512 = "hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==";
+ name = "underscore___underscore_1.13.2.tgz";
+ url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz";
+ sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g==";
};
}
{
@@ -7834,11 +7786,11 @@
};
}
{
- name = "url_parse___url_parse_1.5.3.tgz";
+ name = "url_parse___url_parse_1.5.4.tgz";
path = fetchurl {
- name = "url_parse___url_parse_1.5.3.tgz";
- url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz";
- sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==";
+ name = "url_parse___url_parse_1.5.4.tgz";
+ url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz";
+ sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==";
};
}
{
@@ -8042,11 +7994,11 @@
};
}
{
- name = "webdav___webdav_4.7.0.tgz";
+ name = "webdav___webdav_4.8.0.tgz";
path = fetchurl {
- name = "webdav___webdav_4.7.0.tgz";
- url = "https://registry.yarnpkg.com/webdav/-/webdav-4.7.0.tgz";
- sha512 = "R1WZl/JeFPAmSEn1EPCmxSdPY8IxS/P0qnxAzBeRqEewpxVJ/UiCMJwXHLpyVsKYA1PIb1dYv+UTQsbNaQnLBw==";
+ name = "webdav___webdav_4.8.0.tgz";
+ url = "https://registry.yarnpkg.com/webdav/-/webdav-4.8.0.tgz";
+ sha512 = "CVJvxu0attEfoQUKraDiNh3uMjNPNl+BY0pbcKbyc/X+8IXDnqAT4tT4Ge12w+j49fYuVpFVkpEGwBZabv7Uhw==";
};
}
{
@@ -8258,19 +8210,19 @@
};
}
{
- name = "ws___ws_7.5.6.tgz";
+ name = "ws___ws_7.5.7.tgz";
path = fetchurl {
- name = "ws___ws_7.5.6.tgz";
- url = "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz";
- sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==";
+ name = "ws___ws_7.5.7.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz";
+ sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==";
};
}
{
- name = "ws___ws_8.3.0.tgz";
+ name = "ws___ws_8.5.0.tgz";
path = fetchurl {
- name = "ws___ws_8.3.0.tgz";
- url = "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz";
- sha512 = "Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==";
+ name = "ws___ws_8.5.0.tgz";
+ url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz";
+ sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==";
};
}
{
@@ -8282,11 +8234,11 @@
};
}
{
- name = "xml_encryption___xml_encryption_1.3.0.tgz";
+ name = "xml_encryption___xml_encryption_2.0.0.tgz";
path = fetchurl {
- name = "xml_encryption___xml_encryption_1.3.0.tgz";
- url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz";
- sha512 = "3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA==";
+ name = "xml_encryption___xml_encryption_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-2.0.0.tgz";
+ sha512 = "4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q==";
};
}
{
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 969ea26e362b..b04263a7168a 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "btrbk";
- version = "0.31.3";
+ version = "0.32.0";
src = fetchurl {
url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
- sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2";
+ sha256 = "HmvNtIgFfeaiFuSRobWlcJqusPSYtqAqx+79+CeNVDQ=";
};
nativeBuildInputs = [ asciidoctor makeWrapper ];
diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix
index fb7fc1179571..3c16fb1e0eda 100644
--- a/pkgs/tools/backup/discordchatexporter-cli/default.nix
+++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "discordchatexporter-cli";
- version = "2.31.1";
+ version = "2.32";
src = fetchFromGitHub {
owner = "tyrrrz";
repo = "discordchatexporter";
rev = version;
- sha256 = "QK63H+Qyd8zEue84vECcyAP6FH8az++1PZmbrPvBgrU=";
+ sha256 = "xRoF/HJ4ekHL/Uk6ISQP+65nChRT+n9xLTYcZMJxyvo=";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix
index edc2eccd92a9..a360d0099fd2 100644
--- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix
+++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix
@@ -1,10 +1,10 @@
{ fetchNuGet }: [
- (fetchNuGet { pname = "CliFx"; version = "2.0.6"; sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; })
+ (fetchNuGet { pname = "CliFx"; version = "2.2.1"; sha256 = "1yxxl3jgl6sadar1g9175s62fag5f30lqpgrf58djll3509rbgw5"; })
(fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; })
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
(fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; })
(fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; })
- (fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; })
+ (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; })
(fetchNuGet { pname = "Spectre.Console"; version = "0.43.0"; sha256 = "17yh20s17fkcs3iyb5yylqh90jvb36gdn0aaglq3d67rpmcrl5gc"; })
(fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
]
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index aa6b6d31a897..17abb6503c9b 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -20,18 +20,19 @@ stdenv.mkDerivation rec {
"CPPFLAGS=-DNDEBUG"
"CFLAGS=-O3"
"CXXFLAGS=-O3"
- ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
- "CXX=${stdenv.cc.targetPrefix}c++";
+ "CXX=${stdenv.cc.targetPrefix}c++"
+ ];
setupHook = ./lzip-setup-hook.sh;
doCheck = true;
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
homepage = "https://www.nongnu.org/lzip/lzip.html";
description = "A lossless data compressor based on the LZMA algorithm";
- license = lib.licenses.gpl3Plus;
+ license = lib.licenses.gpl2Plus;
+ maintainers = with maintainers; [ vlaci ];
platforms = lib.platforms.all;
};
}
diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/tools/compression/lziprecover/default.nix
new file mode 100644
index 000000000000..0d8a700e1622
--- /dev/null
+++ b/pkgs/tools/compression/lziprecover/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, lzip }:
+
+stdenv.mkDerivation rec {
+ pname = "lziprecover";
+ version = "1.22";
+
+ src = fetchurl {
+ url = "mirror://savannah/lzip/lziprecover/${pname}-${version}.tar.gz";
+ sha256 = "sha256-/ZWKCXX3cpxE87eE5WaJH3NsPcaDdNvSFJ7mkqFtCGI=";
+ };
+
+ configureFlags = [
+ "CPPFLAGS=-DNDEBUG"
+ "CFLAGS=-O3"
+ "CXXFLAGS=-O3"
+ "CXX=${stdenv.cc.targetPrefix}c++"
+ ];
+
+ doCheck = true;
+ checkInputs = [ lzip ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = "https://www.nongnu.org/lzip/lziprecover.html";
+ description = "Data recovery tool for lzip compressed files";
+ license = lib.licenses.gpl2Plus;
+ maintainers = with maintainers; [ vlaci ];
+ platforms = lib.platforms.all;
+ };
+}
diff --git a/pkgs/tools/compression/nx2elf/default.nix b/pkgs/tools/compression/nx2elf/default.nix
index 8b7f094bf39a..d4963487ada1 100644
--- a/pkgs/tools/compression/nx2elf/default.nix
+++ b/pkgs/tools/compression/nx2elf/default.nix
@@ -2,23 +2,19 @@
stdenv.mkDerivation rec {
pname = "nx2elf";
- version = "unstable-2020-05-26";
+ version = "unstable-2021-11-21";
src = fetchFromGitHub {
owner = "shuffle2";
repo = "nx2elf";
- rev = "7212e82a77b84fcc18ef2d050970350dbf63649b";
- sha256 = "1j4k5s86c6ixa3wdqh4cfm31fxabwn6jcjc6pippx8mii98ac806";
+ rev = "735aaa0648a5a6c996b48add9465db86524999f6";
+ sha256 = "sha256-cS8FFIEgDWva0j9JXhS+s7Y4Oh+mNhFaKRI7BF2hqvs=";
};
buildInputs = [ lz4 ];
postPatch = ''
- # This project does not comply with C++14 standards, and compilation on that fails.
- # This does however succesfully compile with the gnu++20 standard.
- substituteInPlace Makefile --replace "c++14" "gnu++20"
-
- # pkg-config is not supported, so we'll manually use a non-ancient version of lz4
+ # pkg-config is not supported, so we'll manually devendor lz4
cp ${lz4.src}/lib/lz4.{h,c} .
'';
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index a3184f6d1ede..0bff5110c935 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "zstd";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "facebook";
repo = "zstd";
rev = "v${version}";
- sha256 = "sha256-D9+kuIjPYnmg5ht/ezIeYCpyiLkrtdiH3fwpmemIPGM=";
+ sha256 = "sha256-yJvhcysxcbUGuDOqe/TQ3Y5xyM2AUw6r1THSHOqmUy0=";
};
nativeBuildInputs = [ cmake ]
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 5f1775e77e09..d630c7d43f61 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "e2fsprogs";
- version = "1.46.4";
+ version = "1.46.5";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "0ra2d1wasksy1zy3rgviwdni40dnamchisjrrqqi940y545m493m";
+ sha256 = "1fgvwbj9ihz5svzrd2l0s18k16r4qg3wimrniv71fn3vdcg0shxp";
};
outputs = [ "bin" "dev" "out" "man" "info" ];
@@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://e2fsprogs.sourceforge.net/";
+ changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}";
description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
license = with licenses; [
gpl2Plus
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
new file mode 100644
index 000000000000..fbeac15a38e2
--- /dev/null
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -0,0 +1,26 @@
+{ lib, rustPlatform, fetchFromGitea, testVersion, garage }:
+rustPlatform.buildRustPackage rec {
+ pname = "garage";
+ version = "0.6.0";
+
+ src = fetchFromGitea {
+ domain = "git.deuxfleurs.fr";
+ owner = "Deuxfleurs";
+ repo = "garage";
+ rev = "v${version}";
+ sha256 = "sha256-NNjqDOkMMRyXce+Z7RQpuffCuVhA1U3qH30rSv939ks=";
+ };
+
+ cargoSha256 = "sha256-eKJxRcC43D8qVLORer34tlmsWhELTbcJbZLyf0MB618=";
+
+ passthru = {
+ tests.version = testVersion { package = garage; };
+ };
+
+ meta = {
+ description = "S3-compatible object store for small self-hosted geo-distributed deployments";
+ homepage = "https://garagehq.deuxfleurs.fr";
+ license = lib.licenses.agpl3Only;
+ maintainers = with lib.maintainers; [ nickcao _0x4A6F ];
+ };
+}
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index b22273095fa1..6c2a9531e272 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gcsfuse";
- version = "0.38.0";
+ version = "0.39.2";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
- sha256 = "sha256-5qn20Vqtvuld9/IBW/3j+8C3ac8xJ9kRMTiL6GsOrrE=";
+ sha256 = "sha256-vV494WQ6N7Zo1o7NCBC72rl70/evkeaKpfOWNpxQ8mM=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
index a2dc01f8c097..58c5a8d54a2c 100644
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
license = licenses.gpl3;
maintainers = [ maintainers.qknight ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin
};
}
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index a599f50890c5..11d2a3c0b89b 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
description = "A command-line screen capture utility";
platforms = platforms.linux;
maintainers = with maintainers; [ globin ];
- license = licenses.mit;
+ license = licenses.mitAdvertising;
};
}
diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix
index 2e3740dabb7c..9afb6682ba55 100644
--- a/pkgs/tools/graphics/svgbob/default.nix
+++ b/pkgs/tools/graphics/svgbob/default.nix
@@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "svgbob";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchCrate {
inherit version;
crateName = "svgbob_cli";
- sha256 = "sha256-9JASoUN/VzZS8ihepTQL2SXZitxKBMSJEv+13vzQd3w=";
+ sha256 = "sha256-yYRBV0s19J0M02wenGayy7Ebx6wDhiLiGmb+os29u9I=";
};
- cargoSha256 = "sha256-pkdiow+9gsQ9rrSHwukd17r5CfsaJgYj6KA4wYKbtA0=";
+ cargoSha256 = "sha256-R4W+Oe7Ks2D9qE1IpV6/AMMMwZnCfJ5DzxFAMpV2rFE=";
meta = with lib; {
description = "Convert your ascii diagram scribbles into happy little SVG";
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix
index 20dfe15dc6c6..fdd8cb80e567 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/pkgs/tools/graphics/unpaper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }:
+{ lib, stdenv, fetchurl, pkg-config, ffmpeg_4, libxslt }:
stdenv.mkDerivation rec {
pname = "unpaper";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ffmpeg libxslt ];
+ buildInputs = [ ffmpeg_4 libxslt ];
meta = with lib; {
homepage = "https://www.flameeyes.eu/projects/unpaper";
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index d59134a033b7..730786f6b203 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "apt-offline";
- version = "unstable-2021-07-25";
+ version = "unstable-2022-02-06";
src = fetchFromGitHub {
owner = "rickysarraf";
repo = pname;
- rev = "7cfa5fc2736be2c832d0ddfa9255175a1f33158d";
- sha256 = "xX2wcvqoPdgqBAWvQmSd//YWMC4pPmrq0vQjhDUKwEA=";
+ rev = "2b9929773ff2b6e53d30c50c31fb3a1605631f5f";
+ sha256 = "mf2NM39ql6KR/YTWPYNyVe+bvWmUFYfxt5BGmU5WFpQ=";
};
postPatch = ''
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 0a956a325197..9ee56a2d509a 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ddcutil";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "rockowitz";
repo = "ddcutil";
rev = "v${version}";
- sha256 = "sha256-mIYxGoITaFlHgqAfB6ZZFR3spGD0BElJZJJqFGM4r/I=";
+ sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 26b39c66e88f..0c090106640c 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -77,6 +77,9 @@ python3Packages.buildPythonApplication rec {
# Failing because of file-v5.40 has a slightly different output.
# Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271
"test_text_proper_indentation"
+
+ # fails because it fails to determine llvm version
+ "test_item3_deflate_llvm_bitcode"
] ++ lib.optionals stdenv.isDarwin [
# Disable flaky tests on Darwin
"test_non_unicode_filename"
diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix
index 1dd4225ac09b..f36e5217aeaf 100644
--- a/pkgs/tools/misc/esphome/dashboard.nix
+++ b/pkgs/tools/misc/esphome/dashboard.nix
@@ -1,8 +1,9 @@
{ lib
-, python3
+, buildPythonPackage
+, fetchPypi
}:
-with python3.pkgs; buildPythonPackage rec {
+buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20220116.0";
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index e87b88e63b54..f790527c9253 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -1,5 +1,4 @@
{ lib
-, pkgs
, python3
, fetchFromGitHub
, fetchpatch
@@ -11,20 +10,20 @@
let
python = python3.override {
packageOverrides = self: super: {
- esphome-dashboard = pkgs.callPackage ./dashboard.nix {};
+ esphome-dashboard = self.callPackage ./dashboard.nix {};
};
};
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
- version = "2022.1.3";
+ version = "2022.1.4";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-4ME6XiS0tNgxtbHbOXw0z/kOqjzv3pog48qTRGJSsww=";
+ sha256 = "sha256-Pv4Rh92d+Jb3ZKPgKVyrgVHr6PGTcIYybdFavbnjuPA=";
};
patches = [
diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 93983c8fe40b..510a169f2150 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -1,4 +1,8 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib
+, fetchFromGitHub
+, fetchpatch
+, rustPlatform
+}:
rustPlatform.buildRustPackage rec {
pname = "licensor";
@@ -13,6 +17,15 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0";
+ patches = [
+ # Support for 2022, https://github.com/raftario/licensor/pull/68
+ (fetchpatch {
+ name = "support-for-2022.patch";
+ url = "https://github.com/raftario/licensor/commit/6b2f248e5ad9e454fe30d71397691e47ac69b19e.patch";
+ sha256 = "sha256-kXiY5s2kuU+ibV3RpBoy7y3cmJU+gECBTsmRXWBOTP8=";
+ })
+ ];
+
meta = with lib; {
description = "Write licenses to stdout";
homepage = "https://github.com/raftario/licensor";
diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix
index 400a63f7dfe3..4b56dec9d521 100644
--- a/pkgs/tools/misc/rpcsvc-proto/default.nix
+++ b/pkgs/tools/misc/rpcsvc-proto/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rpcsvc-proto";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchFromGitHub {
owner = "thkukuk";
repo = pname;
rev = "v${version}";
- sha256 = "006l1f824r9bcbwn1s1vbs33cdwhs66jn6v97yas597y884y40z9";
+ sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix
index 394cd8a8ede3..85bc57d3556d 100644
--- a/pkgs/tools/misc/sfeed/default.nix
+++ b/pkgs/tools/misc/sfeed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "sfeed";
- version = "1.1";
+ version = "1.2";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
- sha256 = "sha256-0z9PHni/ni4p4nfeStrZmFFHHtyqT8GYJWVWr5IzFKw=";
+ sha256 = "sha256-cx+mIVrY9tB5k1YnAHkpGahXVG6S+JBshJKkzEbcKZI=";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix
index d5a37e2e67f0..d8ba08611207 100644
--- a/pkgs/tools/misc/txr/default.nix
+++ b/pkgs/tools/misc/txr/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, bison, flex, libffi }:
+{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }:
stdenv.mkDerivation rec {
pname = "txr";
- version = "231";
+ version = "273";
src = fetchurl {
url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
- sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc";
+ sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg=";
};
nativeBuildInputs = [ bison flex ];
@@ -17,8 +17,16 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "tests";
- # Remove failing test-- mentions 'usr/bin' so probably related :)
- preCheck = "rm -rf tests/017";
+ postPatch = ''
+ # Fixup references to /usr/bin in tests
+ substituteInPlace tests/017/realpath.tl --replace /usr/bin /bin
+ substituteInPlace tests/017/realpath.expected --replace /usr/bin /bin
+
+ substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env
+ '';
+
+ # Remove failing tests -- 018/chmod tries setting sticky bit
+ preCheck = "rm -rf tests/018/chmod*";
postInstall = ''
d=$out/share/vim-plugins/txr
diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/tools/misc/unparam/default.nix
new file mode 100644
index 000000000000..5840a0d82be8
--- /dev/null
+++ b/pkgs/tools/misc/unparam/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "unparam";
+ version = "unstable-2021-12-14";
+
+ src = fetchFromGitHub {
+ owner = "mvdan";
+ repo = "unparam";
+ rev = "d0ef000c54e5fbf955d67422b0495b9f29b354da";
+ sha256 = "sha256-fH/LcshpOk+UFfQ5dE2eHi6Oi5cm8umeXoyHJvhpAbE=";
+ };
+
+ vendorSha256 = "sha256-pfIxWvJYAus4DShTcBI1bwn/Q2c5qWvCwPCwfUsv8c0=";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "Find unused parameters in Go";
+ homepage = "https://github.com/mvdan/unparam";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 468fa433e846..af484d9f3c23 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -29,7 +29,7 @@
let
pname = "vector";
- version = "0.19.1";
+ version = "0.19.2";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -38,10 +38,10 @@ rustPlatform.buildRustPackage {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ty+tsT3nkdYN7/avG1imIwWKAmtPA3NPjhrtoADciQs=";
+ sha256 = "sha256-fTi9Xu/abQAiVCokfieJUgAtPaqUKw6LJQFqMBoW5yc=";
};
- cargoSha256 = "sha256-dYIAbjBBnEsCGt5ceV+jG0hsu8dcAH4V+wnfm6Chw8Q=";
+ cargoSha256 = "sha256-1bxlO9vuNuPLTLhXwcR6mgOpZwFgdXvGVps5b5ioKJc=";
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix
index fb4a7f32f464..f22817c3b3a3 100644
--- a/pkgs/tools/networking/boundary/default.nix
+++ b/pkgs/tools/networking/boundary/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "boundary";
- version = "0.7.3";
+ version = "0.7.4";
src =
let
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
x86_64-darwin = "darwin_amd64";
};
sha256 = selectSystem {
- x86_64-linux = "sha256-9WEvGU4VfJ1781DlvdJhpdzY4djoSRWu6ZzfOpBvKJQ=";
- aarch64-linux = "sha256-QLjewB1FeYHVehM1U81GzyewWns40IlVEFWgzWP+2Vw=";
- x86_64-darwin = "sha256-YxPkZnU8EBvRWBMsB0jifS63tJ7LQibgtwTbqosC/fg=";
+ x86_64-linux = "sha256-5owLce0A7AwKDXB/JsUJZeHJHhrHT4/kA6XG+ZwhuyU=";
+ aarch64-linux = "sha256-WDFIr+GOip70Di5u9fRu2lVWPMJe9urYTcuc2hTMD7g=";
+ x86_64-darwin = "sha256-FGsY7+bC7n3fu1SsLl92FPytj8MgL4nT95CC6GM6vss=";
};
in
fetchzip {
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 299342197897..126b3b513a86 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "modemmanager";
- version = "1.18.2";
+ version = "1.18.4";
src = fetchurl {
url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz";
- sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o=";
+ sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk=";
};
nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];
diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index ac261f83d570..67cd874d6fd4 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -54,11 +54,11 @@ let
in
stdenv.mkDerivation rec {
pname = "networkmanager";
- version = "1.32.12";
+ version = "1.34.0";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
- sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us=";
+ sha256 = "sha256-gZeV0ImQdiBPVnJCGljxsdnjk1Nu6Hu4RLkR5iQ78L0=";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix
index 27d3a6ce5181..e636950cd981 100644
--- a/pkgs/tools/networking/opensnitch/daemon.nix
+++ b/pkgs/tools/networking/opensnitch/daemon.nix
@@ -10,17 +10,18 @@
, coreutils
, iptables
, makeWrapper
+, protoc-gen-go-grpc
}:
buildGoModule rec {
pname = "opensnitch";
- version = "1.4.3";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
- sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva";
+ sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I=";
};
patches = [
@@ -31,17 +32,15 @@ buildGoModule rec {
url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch";
sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg=";
})
- # Upstream has inconsistent vendoring
- ./go-mod.patch
];
modRoot = "daemon";
buildInputs = [ libnetfilter_queue libnfnetlink ];
- nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ];
+ nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ];
- vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow=";
+ vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A=";
preBuild = ''
make -C ../proto ../daemon/ui/protocol/ui.pb.go
diff --git a/pkgs/tools/networking/opensnitch/go-mod.patch b/pkgs/tools/networking/opensnitch/go-mod.patch
deleted file mode 100644
index 290e92ca755f..000000000000
--- a/pkgs/tools/networking/opensnitch/go-mod.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/daemon/go.mod b/daemon/go.mod
-index ec21c04..a859bfb 100644
---- a/daemon/go.mod
-+++ b/daemon/go.mod
-@@ -5,17 +5,12 @@ go 1.14
- require (
- github.com/evilsocket/ftrace v1.2.0
- github.com/fsnotify/fsnotify v1.4.7
-- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-- github.com/golang/protobuf v1.5.0
- github.com/google/gopacket v1.1.14
- github.com/google/nftables v0.0.0-20210514154851-a285acebcad3
- github.com/iovisor/gobpf v0.2.0
- github.com/vishvananda/netlink v1.1.0
-- github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
-- golang.org/x/net v0.0.0-20190311183353-d8887717615a
-- golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
-- golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 // indirect
-- golang.org/x/text v0.3.0 // indirect
-+ golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
-+ golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c
- google.golang.org/grpc v1.27.0
- google.golang.org/protobuf v1.26.0
- )
diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix
index d211a10d2c5a..8c0b7686d8a7 100644
--- a/pkgs/tools/networking/opensnitch/ui.nix
+++ b/pkgs/tools/networking/opensnitch/ui.nix
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "opensnitch-ui";
- version = "1.4.3";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "evilsocket";
repo = "opensnitch";
rev = "v${version}";
- sha256 = "sha256-amtDSDJOyNSxmJICEqN5lKhGyfF5C6I0EWViB1EXW7A=";
+ sha256 = "sha256-vtD82v0VlaJtCICXduD3IxJ0xjlBuzGKLWLoCiwPX2I=";
};
nativeBuildInputs = [
@@ -26,6 +26,8 @@ python3Packages.buildPythonApplication rec {
unidecode
unicode-slugify
pyinotify
+ notify2
+ # pyasn # dpendency missing but not mandatory
];
preBuild = ''
@@ -48,6 +50,9 @@ python3Packages.buildPythonApplication rec {
dontWrapQtApps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
+ # All tests are sandbox-incompatible and disabled for now
+ doCheck = false;
+
meta = with lib; {
description = "An application firewall";
homepage = "https://github.com/evilsocket/opensnitch/wiki";
diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix
index c24de3947f6d..92abdce68880 100644
--- a/pkgs/tools/nix/alejandra/default.nix
+++ b/pkgs/tools/nix/alejandra/default.nix
@@ -5,21 +5,21 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
- version = "unstable-2022-01-30";
+ version = "unstable-2022-02-10";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
- rev = "b72274b052ae06cbe60a97d623829b1458369cc2";
- sha256 = "sha256-snq9C/a/53VivFcLNvdeKwVmPBXbcVzbbjTB+iULFUc=";
+ rev = "0c095ed50d3bbfd50f9f97832f7ac8092a8c1289";
+ hash = "sha256-eIPyrL8C3qQbEahoryS70cJ4FbXDdPQuWaM2jD2BbI0=";
};
- cargoSha256 = "sha256-/JzATzRhNexmyjtgjHVkw8LVyr4PdIdPJfUGXz4pZbQ=";
+ cargoSha256 = "sha256-DyE0TV/dHbDFkFvF9h0+qi+p2XD8lDZzsUByfOt/UjA=";
meta = with lib; {
- description = "The uncompromising Nix formatter";
+ description = "The Uncompromising Nix Code Formatter";
homepage = "https://github.com/kamadorueda/alejandra";
license = licenses.unlicense;
- maintainers = with maintainers; [ _0x4A6F ];
+ maintainers = with maintainers; [ _0x4A6F kamadorueda ];
};
}
diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix
index df239beb60bc..3d9d34aa7cb5 100644
--- a/pkgs/tools/nix/statix/default.nix
+++ b/pkgs/tools/nix/statix/default.nix
@@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec {
pname = "statix";
# also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix
# the version can be found in flake.nix of the source code
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "nerdypepper";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-68ejROWcDqc4SnivFIrbsSZDqCXEo0sXSiwpro7AmgU=";
+ sha256 = "sha256-ibz5b+amOTlLxDlCPrC7A6rSFac3JXwiq3HMyIJwdUw=";
};
- cargoSha256 = "sha256-YHA97bnGHYRwSZYZ3ZViUlRQskwLPUC26FBWQyBG5Uc=";
+ cargoSha256 = "sha256-MKInDGBZcOp+90cus6X2GAgjZx6M1TbSJgpUQWx60sQ=";
buildFeatures = lib.optional withJson "json";
diff --git a/pkgs/tools/package-management/pdm/check-update.patch b/pkgs/tools/package-management/pdm/check-update.patch
new file mode 100644
index 000000000000..9bc216177e5b
--- /dev/null
+++ b/pkgs/tools/package-management/pdm/check-update.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/conftest.py b/tests/conftest.py
+index d310d36..e15d398 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -252,6 +252,7 @@ def project_no_init(tmp_path, mocker):
+ old_config_map = Config._config_map.copy()
+ tmp_path.joinpath("caches").mkdir(parents=True)
+ p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix()
++ p.global_config["check_update"] = False
+ do_use(p, getattr(sys, "_base_executable", sys.executable))
+ with temp_environ():
+ os.environ.pop("VIRTUAL_ENV", None)
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
new file mode 100644
index 000000000000..e9db7f63fba6
--- /dev/null
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -0,0 +1,106 @@
+{ lib, python3, fetchFromGitHub, fetchurl }:
+let
+ python = python3.override {
+ # override resolvelib due to
+ # 1. pdm requiring a later version of resolvelib
+ # 2. Ansible being packaged as a library
+ # 3. Ansible being unable to upgrade to a later version of resolvelib
+ # see here for more details: https://github.com/NixOS/nixpkgs/pull/155380/files#r786255738
+ packageOverrides = self: super: {
+ resolvelib = super.resolvelib.overridePythonAttrs (attrs: rec {
+ version = "0.8.1";
+ src = fetchFromGitHub {
+ owner = "sarugaku";
+ repo = "resolvelib";
+ rev = version;
+ sha256 = "sha256-QDHEdVET7HN2ZCKxNUMofabR+rxJy0erWhNQn94D7eI=";
+ };
+ });
+ };
+ self = python;
+ };
+in
+
+with python.pkgs;
+buildPythonApplication rec {
+ pname = "pdm";
+ version = "1.12.6";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU=";
+ };
+
+ # this patch allows us to run additional tests that invoke pdm, which checks
+ # itself for an update on every invocation by default, drammatically slowing
+ # down test runs inside the sandbox
+ #
+ # the patch is necessary because the fixture is creating a project and
+ # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream
+ patches = [
+ ./check-update.patch
+ (fetchurl {
+ # Mark test that require network access
+ url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt";
+ hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd";
+ })
+ ];
+
+ propagatedBuildInputs = [
+ blinker
+ click
+ installer
+ packaging
+ pdm-pep517
+ pep517
+ pip
+ platformdirs
+ python-dotenv
+ pythonfinder
+ resolvelib
+ shellingham
+ tomli
+ tomlkit
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ typing-extensions
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-mock
+ pytest-xdist
+ ];
+
+ pytestFlagsArray = [
+ "--numprocesses $NIX_BUILD_CORES"
+ "-m 'not network'"
+ ];
+
+ preCheck = "HOME=$TMPDIR";
+
+ disabledTests = [
+ # sys.executable and expected executable are different
+ "test_set_non_exist_python_path"
+ # pythonfinder isn't aware of nix's python infrastructure
+ "test_auto_isolate_site_packages"
+ "test_use_invalid_wrapper_python"
+ "test_use_wrapper_python"
+ # tries to read/write files without proper permissions
+ "test_completion_command"
+ "test_plugin_add"
+ "test_plugin_list"
+ "test_plugin_remove"
+ # tries to treat a gzip file as a zipfile and fails
+ "test_resolve_local_artifacts"
+ ];
+
+ meta = with lib; {
+ homepage = "https://pdm.fming.dev";
+ description = "A modern Python package manager with PEP 582 support";
+ license = licenses.mit;
+ maintainers = with maintainers; [ cpcloud ];
+ };
+}
diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix
index fd39847c014b..1544194983d1 100644
--- a/pkgs/tools/security/cfripper/default.nix
+++ b/pkgs/tools/security/cfripper/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
- version = "1.3.1";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = version;
- hash = "sha256-BWdXSHIicMa3PgGoF4GGAOh2LAJWt+7svMLFGhWIkn0=";
+ hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index fbb9c421e353..64d8885eedd4 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -10,14 +10,15 @@
python3.pkgs.buildPythonApplication rec {
pname = "chipsec";
- version = "1.6.1";
+ version = "1.8.1";
+
disabled = !stdenv.isLinux;
src = fetchFromGitHub {
owner = "chipsec";
repo = "chipsec";
rev = version;
- sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2";
+ hash = "sha256-bK8wlwhP0pi8rOs8ysbSZ+0aZOaX4mckfH/p4OLGnes=";
};
patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ];
@@ -29,9 +30,9 @@ python3.pkgs.buildPythonApplication rec {
nasm
];
- checkInputs = [
- python3.pkgs.distro
- python3.pkgs.pytestCheckHook
+ checkInputs = with python3.pkgs; [
+ distro
+ pytestCheckHook
];
preBuild = lib.optionalString withDriver ''
@@ -45,10 +46,15 @@ python3.pkgs.buildPythonApplication rec {
$out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko
'';
- setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ]
- ++ lib.optional (!withDriver) "--skip-driver";
+ setupPyBuildFlags = [
+ "--build-lib=$CHIPSEC_BUILD_LIB"
+ ] ++ lib.optional (!withDriver) [
+ "--skip-driver"
+ ];
- pythonImportsCheck = [ "chipsec" ];
+ pythonImportsCheck = [
+ "chipsec"
+ ];
meta = with lib; {
description = "Platform Security Assessment Framework";
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 92848def1d1c..6c3fb0727091 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,5 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, python3 }:
-
+{ lib, stdenv, fetchFromGitHub
+, python3
+, fetchpatch
+}:
python3.pkgs.buildPythonApplication rec {
pname = "fail2ban";
@@ -17,7 +19,21 @@ python3.pkgs.buildPythonApplication rec {
systemd
];
+ patches = [
+ # remove references to use_2to3, for setuptools>=58
+ # has been merged into master, remove next release
+ (fetchpatch {
+ url = "https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497.patch";
+ sha256 = "sha256-aozQJHwPcJTe/D/PLQzBk1YH3OAP6Qm7wO7cai5CVYI=";
+ })
+ ];
+
preConfigure = ''
+ # workaround for setuptools 58+
+ # https://github.com/fail2ban/fail2ban/issues/3098
+ patchShebangs fail2ban-2to3
+ ./fail2ban-2to3
+
for i in config/action.d/sendmail*.conf; do
substituteInPlace $i \
--replace /usr/sbin/sendmail sendmail \
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index b088f07c6e3d..89e079364811 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -1,15 +1,29 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "haveged";
- version = "1.9.2";
+ version = "1.9.15";
- src = fetchurl {
- url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz";
- sha256 = "0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp";
+ src = fetchFromGitHub {
+ owner = "jirka-h";
+ repo = "haveged";
+ rev = "v${version}";
+ sha256 = "sha256-bU+/lRx0RAqHheNQ9CWT/V0oZnZd0W9EHhhX3RRIZ/0=";
};
- meta = {
+ strictDeps = true;
+
+ postPatch = ''
+ patchShebangs ent # test shebang
+ '';
+
+ installFlags = [
+ "sbindir=$(out)/bin" # no reason for us to have a $out/sbin, its just a symlink to $out/bin
+ ];
+
+ doCheck = true;
+
+ meta = with lib; {
description = "A simple entropy daemon";
longDescription = ''
The haveged project is an attempt to provide an easy-to-use, unpredictable
@@ -19,9 +33,9 @@ stdenv.mkDerivation rec {
of haveged is directed towards improving overall reliability and adaptability while minimizing
the barriers to using haveged for other tasks.
'';
- homepage = "http://www.issihosts.com/haveged/";
- license = lib.licenses.gpl3;
- maintainers = [ lib.maintainers.domenkozar ];
- platforms = lib.platforms.unix;
+ homepage = "https://github.com/jirka-h/haveged";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ domenkozar ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index 9adf63ea160f..338e00d79d19 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -6,20 +6,20 @@
buildGoModule rec {
pname = "kubescape";
- version = "2.0.144";
+ version = "2.0.146";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
- hash = "sha256-X/r39lvNSLZ4SG/x5Woj7c0fEOp8USyeTWYihaY0faU=";
+ hash = "sha256-OSpT6S0jCw/svWl4q9CyZUwUB/cFAyiyWt+oXKVPSJ0=";
};
nativeBuildInputs = [
installShellFiles
];
- vendorSha256 = "sha256-gB1/WkGC3sgMqmA4F9/dGU0R0hIDwwTVBNNsY6Yj8KU=";
+ vendorSha256 = "sha256-p2bLZfwsSevaiAqciCfEvpdOx3WlVdWBHVXtLBMjLGA=";
ldflags = [
"-s"
diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix
new file mode 100644
index 000000000000..afe1d03fff0b
--- /dev/null
+++ b/pkgs/tools/security/pinentry-bemenu/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libassuan
+, libgpg-error, popt, bemenu }:
+
+stdenv.mkDerivation rec {
+ pname = "pinentry-bemenu";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "t-8ch";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-AFS4T7VqPga53/3rG8be9Q//6/2JJIe7+Ata33ewySg=";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ];
+ buildInputs = [ libassuan libgpg-error popt bemenu ];
+
+ meta = with lib; {
+ description = "Pinentry implementation based on bemenu";
+ homepage = "https://github.com/t-8ch/pinentry-bemenu";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ jc ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix
index d403d7283171..97a42646312e 100644
--- a/pkgs/tools/security/step-ca/default.nix
+++ b/pkgs/tools/security/step-ca/default.nix
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "step-ca";
- version = "0.18.0";
+ version = "0.18.1";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
- sha256 = "sha256-f9sp5sAWysOOoIdCiCJxTWRhyt0wfpO5p4pxW6jj0xc=";
+ sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM=";
};
- vendorSha256 = "sha256-iDfPCRU91cuZsKqNOjkLGYmWf8i5FO4NmDsfD5Xqip0=";
+ vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic=";
ldflags = [ "-buildid=" ];
diff --git a/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch b/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch
deleted file mode 100644
index b19b9ffe8a62..000000000000
--- a/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 1c915f1..83a8e41 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversion -Wconversion -Wfloat-conversion -Wshorten-64-to-32 -Wuninitialized -Wmissing-variable-declarations -Wmissing-declarations
- WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align
- CFLAGS ?= -g
--OPTS=-I. -O3 $(CFLAGS) -fcommon -Wl,--allow-multiple-definition
-+OPTS=-I. -O3 $(CFLAGS) -fcommon
- # -Wall -g -pedantic
- LIBS=-lm
- DESTDIR ?=
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index b12daff00387..b6e3056e0232 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -3,19 +3,15 @@
stdenv.mkDerivation rec {
pname = "thc-hydra";
- version = "9.2";
+ version = "9.3";
src = fetchFromGitHub {
owner = "vanhauser-thc";
repo = "thc-hydra";
rev = "v${version}";
- sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58=";
+ sha256 = "sha256-SzbaU52IXw5+ztN/GKD6Ki6/cx2icoZEzLHBu/J8sk0=";
};
- patches = lib.optionals stdenv.isDarwin [
- ./darwin-remove-ldflag.patch
- ];
-
postPatch = let
makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs);
in ''
@@ -44,9 +40,11 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A very fast network logon cracker which support many different services";
- homepage = "https://www.thc.org/thc-hydra/";
- license = licenses.agpl3;
+ homepage = "https://github.com/vanhauser-thc/thc-hydra"; # https://www.thc.org/
+ changelog = "https://github.com/vanhauser-thc/thc-hydra/raw/v${version}/CHANGES";
+ license = licenses.agpl3Plus;
maintainers = with maintainers; [ offline ];
platforms = platforms.unix;
+ badPlatforms = platforms.darwin; # fails to build since v9.3
};
}
diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix
index ec94a9f337f8..41e4d99f6a4c 100644
--- a/pkgs/tools/system/gdu/default.nix
+++ b/pkgs/tools/system/gdu/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
- version = "5.13.0";
+ version = "5.13.1";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-yOYwPr/Yz/PGpCZtv/dWVFgll6VM7wQEtU/jEVpMjlE=";
+ sha256 = "sha256-bUzL9QkSgzJePBnGSYQvsKC975ss5b3kBdIgwgGzEtk=";
};
vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc=";
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
index ee86bcd635e3..729a0900f851 100644
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -2,27 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
- version = "0.12.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
- sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU=";
+ sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE=";
};
- cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4=";
-
- postPatch = ''
- pushd vendor
- for grammar in */; do
- if [ -d "${tree-sitter.grammars}/$grammar" ]; then
- rm -r "$grammar"
- ln -s "${tree-sitter.grammars}/$grammar"
- fi
- done
- popd
- '';
+ cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94=";
meta = with lib; {
description = "A syntax-aware diff";
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 86ea78c4aa12..67a7b03f180f 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
- version = "2.14.0";
+ version = "2.15.0";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@@ -11,10 +11,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw=";
+ sha256 = "sha256-HWekPMrQYTizyiRu9QSztZfZXsDmybXYarj6alGWJag=";
};
- vendorSha256 = "sha256-MGNv1mEIOvhcpL40MuQob5Uu4qqIGhJxPZTi8BvqQ0s=";
+ vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE=";
postInstall = ''
mkdir -p $data/share/vale
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 77c187a48a61..4d9fdfd7820e 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A suite of programs for processing MPEG or MJPEG video";
homepage = "http://mjpeg.sourceforge.net/";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
};
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index e35057fb888f..ed6a8f542343 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -4,14 +4,14 @@ let
rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform;
in rustPlatform.buildRustPackage rec {
pname = "rav1e";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-3g2wqQJk26KUfzmneKdTxfNSRI/ioMa5MR6AEeR7eKs=";
+ sha256 = "sha256-v2i/dMWos+nB3cRDOkROSOPb1ONRosbmp9RDZI2DLeI=";
};
- cargoSha256 = "sha256-sPUAWQj8UDHV7IvYnerASltSPPGVB7f1tThqFYBu6t4=";
+ cargoSha256 = "sha256-V9QbztkFj3t5yBV+yySysDy3Q6IUY4gNzBL8h23aEg4=";
nativeBuildInputs = [ nasm cargo-c ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index 014459888bcc..31a3e5dac4c7 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -11,10 +11,10 @@
}:
let
- sha256 = "0vyvmfrq3jnwqqjf2rsd5qnnwvvq71165ws7smnxk5jn8lqkq6z1";
+ sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
- specVersion = "4.114.0";
- specSha256 = "1q0w2d3wb41f36rc04cdipfld9h3llcy1fndqmpymc1c55fc949r";
+ specVersion = "4.115.0";
+ specSha256 = "1s9pis1jl6d8znkb8hwsv89wzf38bhjing4x4q9ggy038y7xkkwg";
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = specSha256;
@@ -24,7 +24,7 @@ in
buildPythonApplication rec {
pname = "linode-cli";
- version = "5.16.0";
+ version = "5.17.1";
src = fetchFromGitHub {
owner = "linode";
diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix
index b6de504be8a4..c1bcf3b4e9f0 100644
--- a/pkgs/tools/wayland/swayr/default.nix
+++ b/pkgs/tools/wayland/swayr/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "swayr";
- version = "0.12.1";
+ version = "0.13.0";
src = fetchFromSourcehut {
owner = "~tsdh";
repo = "swayr";
rev = "v${version}";
- sha256 = "sha256-xcpgebGyYJep4vSdBb0OXhX66DGA7w3B5KYOHj8BKKM=";
+ sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go=";
};
- cargoSha256 = "sha256-CYavcHLIQKEh1SoELevAa6g0Q2nksWwcS7/syK4oYq0=";
+ cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA=";
patches = [
./icon-paths.patch
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 24804ca5e57f..91d27030f638 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -3,11 +3,11 @@ lib: self: super:
with self;
let
- # Removing recurseForDerivation prevents derivations of aliased attribute
- # set to appear while listing all the packages available.
+ # Removing recurseForDerivation prevents derivations of aliased attribute set
+ # to appear while listing all the packages available.
removeRecurseForDerivations = alias: with lib;
- if alias.recurseForDerivations or false then
- removeAttrs alias ["recurseForDerivations"]
+ if alias.recurseForDerivations or false
+ then removeAttrs alias ["recurseForDerivations"]
else alias;
# Disabling distribution prevents top-level aliases for non-recursed package
@@ -17,117 +17,133 @@ let
dontDistribute alias
else alias;
- # Make sure that we are not shadowing something from
- # all-packages.nix.
- checkInPkgs = n: alias: if builtins.hasAttr n super
- then throw "Alias ${n} is still in all-packages.nix"
- else alias;
+ # Make sure that we are not shadowing something from all-packages.nix.
+ checkInPkgs = n: alias:
+ if builtins.hasAttr n super
+ then throw "Alias ${n} is still in all-packages.nix"
+ else alias;
mapAliases = aliases:
- lib.mapAttrs (n: alias: removeDistribute
- (removeRecurseForDerivations
- (checkInPkgs n alias)))
- aliases;
+ lib.mapAttrs (n: alias:
+ removeDistribute
+ (removeRecurseForDerivations
+ (checkInPkgs n alias)))
+ aliases;
in
- ### Deprecated aliases - for backward compatibility
+### Deprecated aliases - for backward compatibility
+### Please maintain this list in ASCIIbetical ordering.
+### Hint: the "sections" are delimited by ### ###
mapAliases ({
+ # forceSystem should not be used directly in Nixpkgs.
+ # Added 2018-07-16
+ forceSystem = system: _:
+ (import self.path { localSystem = { inherit system; }; });
+
_0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/";
- PPSSPP = ppsspp; # added 2017-10-01
- QmidiNet = qmidinet; # added 2016-05-22
- accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
- adobeReader = adobe-reader; # added 2013-11-04
- adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01
- aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
- ag = silver-searcher; # added 2018-04-25
- aircrackng = aircrack-ng; # added 2016-01-14
- airtame = throw "airtame has been removed due to being unmaintained."; # added 2022-01-19
- aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
- alienfx = throw "alienfx has been removed."; # added 2019-12-08
- alsaLib = alsa-lib; # added 2021-06-09
- alsaOss = alsa-oss; # added 2021-06-10
- alsaPlugins = alsa-plugins; # added 2021-06-10
- alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10
- alsaTools = alsa-tools; # added 2021-06-10
- alsaUtils = alsa-utils; # added 2021-06-10
- amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
- aminal = throw "aminal was renamed to darktile."; # added 2021-09-28
- ammonite-repl = ammonite; # added 2017-05-02
- amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
- angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06
- antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06
- antimicroX = antimicrox; # added 2021-10-31
- arduino_core = arduino-core; # added 2015-02-04
- ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28
- arora = throw "arora has been removed."; # added 2020-09-09
- asciidocFull = asciidoc-full; # added 2014-06-22
- asn1c = throw "asn1c has been removed: deleted by upstream"; # added 2022-01-07
- asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07
- at_spi2_atk = at-spi2-atk; # added 2018-02-25
- at_spi2_core = at-spi2-core; # added 2018-02-25
- aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26
- avldrums-lv2 = x42-avldrums; # added 2020-03-29
- avxsynth = throw "avxsynth was removed because it was broken"; # added 2021-05-18
- azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # added 2021-08-02
+
+ ### A ###
+
+ accounts-qt = libsForQt5.accounts-qt; # Added 2015-12-19
+ adobeReader = adobe-reader; # Added 2013-11-04
+ adobe_flex_sdk = apache-flex-sdk; # Added 2018-06-01
+ aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05
+ ag = silver-searcher; # Added 2018-04-25
+ aircrackng = aircrack-ng; # Added 2016-01-14
+ airtame = throw "airtame has been removed due to being unmaintained."; # Added 2022-01-19
+ aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # Added 2020-11-30
+ alienfx = throw "alienfx has been removed."; # Added 2019-12-08
+ alsaLib = alsa-lib; # Added 2021-06-09
+ alsaOss = alsa-oss; # Added 2021-06-10
+ alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10
+ alsaPlugins = alsa-plugins; # Added 2021-06-10
+ alsaTools = alsa-tools; # Added 2021-06-10
+ alsaUtils = alsa-utils; # Added 2021-06-10
+ amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30
+ aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28
+ ammonite-repl = ammonite; # Added 2017-05-02
+ amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09
+ angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06
+ antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06
+ antimicroX = antimicrox; # Added 2021-10-31
+ ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28
+ arduino_core = arduino-core; # Added 2015-02-04
+ arora = throw "arora has been removed."; # Added 2020-09-09
+ asciidocFull = asciidoc-full; # Added 2014-06-22
+ asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07
+ asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # Added 2020-10-07
+ at_spi2_atk = at-spi2-atk; # Added 2018-02-25
+ at_spi2_core = at-spi2-core; # Added 2018-02-25
+ aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # Added 2020-12-26
+ avldrums-lv2 = x42-avldrums; # Added 2020-03-29
+ avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
+ azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02
+
+ ### B ###
+
badtouch = authoscope; # Project was renamed, added 20210626
- bar-xft = lemonbar-xft; # added 2015-01-16
- bashburn = throw "bashburn has been removed: deleted by upstream"; # added 2022-01-07
+ bar-xft = lemonbar-xft; # Added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
- bash_5 = bash; # added 2021-08-20
- bashInteractive_5 = bashInteractive; # added 2021-08-20
- batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
- bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
- bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
- bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22
- beegfs = throw "beegfs has been removed."; # added 2019-11-24
- beret = throw "beret has been removed"; # added 2021-11-16
- blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # added 2022-01-01
+ bashInteractive_5 = bashInteractive; # Added 2021-08-20
+ bash_5 = bash; # Added 2021-08-20
+ bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07
+ batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10
+ bazaar = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19
+ bazaarTools = throw "bazaar has been deprecated by breezy."; # Added 2020-04-19
+ bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
+ beegfs = throw "beegfs has been removed."; # Added 2019-11-24
+ beret = throw "beret has been removed"; # Added 2021-11-16
+ bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07
+ bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22
+ blastem = throw "blastem has been removed from nixpkgs as it would still require python2."; # Added 2022-01-01
bluezFull = bluez; # Added 2019-12-03
- bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # added 2022-01-07
+ bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10
+ bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10
bpftool = bpftools; # Added 2021-05-03
- brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
- bridge_utils = bridge-utils; # added 2015-02-20
- bro = zeek; # added 2019-09-29
- bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
- bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10
- btrfsProgs = btrfs-progs; # added 2016-01-03
- bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22
+ brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24
+ bridge_utils = bridge-utils; # Added 2015-02-20
+ bro = zeek; # Added 2019-09-29
+ btrfsProgs = btrfs-progs; # Added 2016-01-03
# bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
bitwarden_rs = vaultwarden;
- bitwarden_rs-sqlite = vaultwarden-sqlite;
bitwarden_rs-mysql = vaultwarden-mysql;
bitwarden_rs-postgresql = vaultwarden-postgresql;
+ bitwarden_rs-sqlite = vaultwarden-sqlite;
bitwarden_rs-vault = vaultwarden-vault;
- blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # added 2022-01-12
- bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02
- bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07
- btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03
- buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
- buildkite-agent3 = buildkite-agent; # added 2018-09-26
- bundler_HEAD = bundler; # added 2015-11-15
- bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07
- bypass403 = throw "bypass403 has been removed: deleted by upstream"; # added 2022-01-07
- calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13
- calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13
- caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02
- cantarell_fonts = cantarell-fonts; # added 2018-03-03
- cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20
+ blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal."; # Added 2022-01-12
+ bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # Added 2021-01-02
+ bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07
+ btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03
+ buildPerlPackage = perlPackages.buildPerlPackage; # Added 2018-10-12
+ buildkite-agent3 = buildkite-agent; # Added 2018-09-26
+ bundler_HEAD = bundler; # Added 2015-11-15
+ bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07
+ bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07
+
+ ### C ###
+
+ caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02
+ calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # Added 2021-01-13
+ calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # Added 2021-01-13
+ cantarell_fonts = cantarell-fonts; # Added 2018-03-03
+ cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # Added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken.";
- catfish = xfce.catfish; # added 2019-12-22
- ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25
- cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # added 2022-01-12
- cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05
- checkbashism = checkbashisms; # added 2016-08-16
- chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15
- chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # added 2022-01-07
+ catfish = xfce.catfish; # Added 2019-12-22
+ ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25
+ cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore."; # Added 2022-01-12
+ cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # Added 2020-06-05
+ checkbashism = checkbashisms; # Added 2016-08-16
+ chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15
+ chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07
cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream";
- cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
- cifs_utils = cifs-utils; # added 2016-08
- ckb = ckb-next; # added 2018-10-21
- creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01
+ cifs_utils = cifs-utils; # Added 2016-08
+ cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10
+ ckb = ckb-next; # Added 2018-10-21
+ callPackage_i686 = pkgsi686Linux.callPackage;
+ creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01
# these are for convenience, not for backward compat and shouldn't expire
clang5Stdenv = lowPrio llvmPackages_5.stdenv;
@@ -139,75 +155,84 @@ mapAliases ({
clang11Stdenv = lowPrio llvmPackages_11.stdenv;
clang12Stdenv = lowPrio llvmPackages_12.stdenv;
- clangAnalyzer = clang-analyzer; # added 2015-02-20
- claws-mail-gtk3 = claws-mail; # added 2021-07-10
- clawsMail = claws-mail; # added 2016-04-29
- claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # added 2021-12-05
- clutter_gtk = clutter-gtk; # added 2018-02-25
- cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05
- 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
- couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03
- couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03
- coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16
- corsmisc = throw "corsmisc has been removed (upstream is gone)"; # added 2022-01-24
- cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30
- cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # added 2022-01-07
- crafty = throw "crafty has been removed: deleted by upstream"; # 2022-01-07
- cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21
- cpp-gsl = microsoft_gsl; # added 2019-05-24
- cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14
- cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14
- cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14
- cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14
- cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
- cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18
- cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18
- cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18
- cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18
- cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14
- cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14
- cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
- cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14
- cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18
- cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18
- cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18
- cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18
- cupsBjnp = cups-bjnp; # added 2016-01-02
- cups_filters = cups-filters; # added 2016-08
- cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
+ clangAnalyzer = clang-analyzer; # Added 2015-02-20
+ claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
+ claws-mail-gtk3 = claws-mail; # Added 2021-07-10
+ clawsMail = claws-mail; # Added 2016-04-29
+ clutter_gtk = clutter-gtk; # Added 2018-02-25
+ cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
+ 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
+ coredumper = throw "coredumper has been removed: abandoned by upstream."; # Added 2019-11-16
+ corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24
+ couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
+ couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
+ cpp-gsl = microsoft_gsl; # Added 2019-05-24
+ cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # Added 2020-11-30
+ cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
+ crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07
+ cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21
+
+ # CUDA Toolkit
+
+ cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14
+ cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18
+ cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18
+
cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
- curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # added 2022-01-12
- curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23
- cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15
- cv = progress; # added 2015-09-06
- cvs_fast_export = cvs-fast-export; # added 2021-06-10
- d1x_rebirth = dxx-rebirth; # added 2018-04-25
- d2x_rebirth = dxx-rebirth; # added 2018-04-25
- dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15
- dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15
- dart_stable = dart; # added 2020-01-15
+ cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # Added 2020-06-15
+ cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006";
+ cupsBjnp = cups-bjnp; # Added 2016-01-02
+ cups_filters = cups-filters; # Added 2016-08
+ curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages."; # Added 2022-01-12
+ curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23
+ cv = progress; # Added 2015-09-06
+ cvs_fast_export = cvs-fast-export; # Added 2021-06-10
+
+ ### D ###
+
+ d1x_rebirth = dxx-rebirth; # Added 2018-04-25
+ d2x_rebirth = dxx-rebirth; # Added 2018-04-25
+ dart_dev = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15
+ dart_old = throw "Non-stable versions of Dart have been removed."; # Added 2020-01-15
+ dart_stable = dart; # Added 2020-01-15
dat = nodePackages.dat;
- dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20
- dbus_daemon = dbus.daemon; # added 2018-04-25
- dbus_glib = dbus-glib; # added 2018-02-25
- dbus_libs = dbus; # added 2018-04-25
- diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
- dbus_tools = dbus.out; # added 2018-04-25
- deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
+ dbus_daemon = dbus.daemon; # Added 2018-04-25
+ dbus_glib = dbus-glib; # Added 2018-02-25
+ dbus_libs = dbus; # Added 2018-04-25
+ dbus_tools = dbus.out; # Added 2018-04-25
+ dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20
+ deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
+
debian_devscripts = debian-devscripts; # added 2016-03-23
- debugedit-unstable = debugedit; # added 2021-11-22
+ debugedit-unstable = debugedit; # Added 2021-11-22
deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
- deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06
deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06
+ deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06
deltachat-electron = deltachat-desktop; # added 2021-07-18
+ diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10
+
deluge-1_x = throw ''
Deluge 1.x (deluge-1_x) is no longer supported.
Please use Deluge 2.x (deluge-2_x) instead, for example:
@@ -215,112 +240,133 @@ mapAliases ({
services.deluge.package = pkgs.deluge-2_x;
Note that it is NOT possible to switch back to Deluge 1.x after this change.
- ''; # added 2021-08-18
- desktop_file_utils = desktop-file-utils; # added 2018-02-25
- devicemapper = lvm2; # added 2018-04-25
- digikam5 = digikam; # added 2017-02-18
- displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # added 2022-01-12
- dmtx = dmtx-utils; # added 2018-04-25
- dnnl = oneDNN; # added 2020-04-22
- docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
- docbookrx = throw "docbookrx has been removed since it was unmaintained"; # added 2021-01-12
- docbook_xml_xslt = docbook_xsl; # added 2018-04-25
- dolphinEmu = dolphin-emu; # added 2021-11-10
- dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10
- dotnet-netcore = dotnet-runtime; # added 2021-10-07
- double_conversion = double-conversion; # 2017-11-22
- docker_compose = docker-compose; # 2018-11-10
- draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
- dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
- dwarf_fortress = dwarf-fortress; # added 2016-01-23
- dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
- dylibbundler = macdylibbundler; # added 2021-04-24
- ec2-utils = amazon-ec2-utils; # added 2022-02-01
- ec2_ami_tools = ec2-ami-tools; # added 2021-10-08
- ec2_api_tools = ec2-api-tools; # added 2021-10-08
- elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
- elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
- electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2021-01-06
- electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2021-01-06
- electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2021-01-06
- electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2021-01-06
- electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # added 2022-01-01
- emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
- emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
- emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
- emacsPackagesNg = emacs.pkgs; # added 2019-08-07
- emacs27Packages = emacs27.pkgs; # added 2020-12-18
- emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18
- emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18
- emacsPackages = emacs.pkgs; # added 2020-12-18
- enblendenfuse = enblend-enfuse; # 2015-09-30
- encryptr = throw "encryptr was removed because it reached end of life"; # added 2022-02-06
- envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
- epoxy = libepoxy; # 2021-11-11
- esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12
- euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01
- evolution_data_server = evolution-data-server; # added 2018-02-25
- etcdctl = etcd; # added 2018-04-25
- evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # added 2022-01-14
- exfat-utils = exfat; # 2015-09-11
- facette = throw "facette has been removed."; # added 2020-01-06
- fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- fastnlo = fastnlo_toolkit; # added 2021-04-24
- fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13
- fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
- ffadoFull = ffado; # added 2018-05-01
- firefox-esr-68 = throw "Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore removed from nixpkgs";
- firefox-esr-wrapper = firefox-esr; # 2016-01
- firefox-wrapper = firefox; # 2016-01
- firefoxWrapper = firefox; # 2015-09
+ ''; # Added 2021-08-18
+
+ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
+ desktop_file_utils = desktop-file-utils; # Added 2018-02-25
+ devicemapper = lvm2; # Added 2018-04-25
+ digikam5 = digikam; # Added 2017-02-18
+ displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3."; # Added 2022-01-12
+ dmtx = dmtx-utils; # Added 2018-04-25
+ dnnl = oneDNN; # Added 2020-04-22
+ docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25
+ docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12
+ docbook_xml_xslt = docbook_xsl; # Added 2018-04-25
+ docker_compose = docker-compose; # Added 2018-11-10
+ dolphinEmu = dolphin-emu; # Added 2021-11-10
+ dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
+ dotnet-netcore = dotnet-runtime; # Added 2021-10-07
+ double_conversion = double-conversion; # Added 2017-11-22
+ draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
+ dvb_apps = throw "dvb_apps has been removed."; # Added 2020-11-03
+ dwarf_fortress = dwarf-fortress; # Added 2016-01-23
+ dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # Added 2021-02-07
+ dylibbundler = macdylibbundler; # Added 2021-04-24
+
+ ### E ###
+
+
+ ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08
+ ec2_api_tools = ec2-api-tools; # Added 2021-10-08
+ ec2-utils = amazon-ec2-utils; # Added 2022-02-01
+ elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17
+ elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
+
+ # Electron
+ electron_3 = throw "electron_3 has been removed in favor of newer versions"; # Added 2021-01-06
+ electron_4 = throw "electron_4 has been removed in favor of newer versions"; # Added 2021-01-06
+ electron_5 = throw "electron_5 has been removed in favor of newer versions"; # Added 2021-01-06
+ electron_6 = throw "electron_6 has been removed in favor of newer versions"; # Added 2021-01-06
+
+ electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # Added 2022-01-01
+
+ # Emacs
+ emacs27Packages = emacs27.pkgs; # Added 2020-12-18
+ emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18
+ emacsPackages = emacs.pkgs; # Added 2020-12-18
+ emacsPackagesGen = emacsPackagesFor; # Added 2018-08-18
+ emacsPackagesNg = emacs.pkgs; # Added 2019-08-07
+ emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07
+ emacsPackagesNgGen = emacsPackagesFor; # Added 2018-08-18
+ emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18
+
+ enblendenfuse = enblend-enfuse; # Added 2015-09-30
+ encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
+ envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05
+ epoxy = libepoxy; # Added 2021-11-11
+ esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
+ etcdctl = etcd; # Added 2018-04-25
+ euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # Added 2022-01-01
+ evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # Added 2022-01-14
+ evolution_data_server = evolution-data-server; # Added 2018-02-25
+ exfat-utils = exfat; # Added 2015-09-11
+
+ ### F ###
+
+ facette = throw "facette has been removed."; # Added 2020-01-06
+ fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ fastnlo = fastnlo_toolkit; # Added 2021-04-24
+ fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # Added 2021-04-13
+ fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
+ ffadoFull = ffado; # Added 2018-05-01
+ firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25.";
+ firefox-esr-wrapper = firefox-esr; # Added 2016-01
+ firefoxWrapper = firefox; # Added 2015-09
+ firefox-wrapper = firefox; # Added 2016-01
+ firestr = throw "firestr has been removed."; # Added 2019-12-08
+ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
+ fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10
+ flameGraph = flamegraph; # Added 2018-04-25
+ flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
+ flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
+ flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
+ flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31
+ flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25
+ flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15
+ flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15
+ flvtool2 = throw "flvtool2 has been removed."; # Added 2020-11-03
+ fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # Added 2022-01-26
+ foldingathome = fahclient; # Added 2020-09-03
+ font-awesome-ttf = font-awesome; # Added 2018-02-25
- firestr = throw "firestr has been removed."; # added 2019-12-08
- firmwareLinuxNonfree = linux-firmware; # added 2022-01-09
- fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
- flameGraph = flamegraph; # added 2018-04-25
- flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
- flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
- flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
- flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # added 2021-06-31
- flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
- flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
- flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
- flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
- fme = throw "fme was removed, because it is old and uses Glade, a discontinued library."; # added 2022-01-26
- foldingathome = fahclient; # added 2020-09-03
- font-awesome-ttf = font-awesome; # 2018-02-25
- # 2019-10-31
fontconfig-ultimate = throw ''
fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years.
https://github.com/bohoomil/fontconfig-ultimate/issues/171.
- '';
+ ''; # Added 2019-10-31
+
fontconfig-penultimate = throw ''
fontconfig-penultimate has been removed.
It was a fork of the abandoned fontconfig-ultimate.
- '';
- # 2020-07-21
+ ''; # Added 2020-07-21
+
fontconfig_210 = throw ''
fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384
and has only been used for old fontconfig caches.
'';
- foomatic_filters = foomatic-filters; # 2016-08
- fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07
+
+ foomatic_filters = foomatic-filters; # Added 2016-08
+ fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # Added 2021-11-07
fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later";
- fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # 2022-01-15
- fuse_exfat = exfat; # 2015-09-11
- fuseki = apache-jena-fuseki; # added 2018-04-25
- fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
- g4py = python3Packages.geant4; # added 2020-06-06
- gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # added 2020-06-06
- gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03
- gdb-multitarget = gdb; # added 2017-11-13
- gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
- gettextWithExpat = gettext; # 2016-02-19
- getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12
- gfm = throw "gfm has been removed"; # 2021-01-15
- giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12
- git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01
- gitAndTools = self // { # added 2021-01-14
+ fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15
+ fuse_exfat = exfat; # Added 2015-09-11
+ fuseki = apache-jena-fuseki; # Added 2018-04-25
+ fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19
+
+ ### G ###
+
+ g4py = python3Packages.geant4; # Added 2020-06-06
+ gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06
+ gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # Added 2021-04-03
+ gdb-multitarget = gdb; # Added 2017-11-13
+ gdk_pixbuf = gdk-pixbuf; # Added 2019-05-22
+ getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # Added 2022-01-12
+ gettextWithExpat = gettext; # Added 2016-02-19
+ gfm = throw "gfm has been removed"; # Added 2021-01-15
+ giblib = throw " giblib has been removed from nixpkgs because upstream is gone."; # Added 2022-01-23
+ giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
+ git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01
+
+ gitAndTools = self // {
darcsToGit = darcs-to-git;
gitAnnex = git-annex;
gitBrunch = git-brunch;
@@ -328,254 +374,288 @@ mapAliases ({
gitRemoteGcrypt = git-remote-gcrypt;
svn_all_fast_export = svn-all-fast-export;
topGit = top-git;
- };
- gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07
- gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # added 2022-01-12
- gksu = throw "gksu has been removed"; # added 2022-01-16
- glib_networking = glib-networking; # added 2018-02-25
- gmailieer = lieer; # added 2020-04-19
- gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08
- gnome-mpv = celluloid; # added 2019-08-22
+ }; # Added 2021-01-14
+
+ gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07
+ gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # Added 2022-01-12
+ gksu = throw "gksu has been removed"; # Added 2022-01-16
+ glib_networking = glib-networking; # Added 2018-02-25
+ gmailieer = lieer; # Added 2020-04-19
+ gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07
+ gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08
+ gnash = throw "gnash has been removed; broken and abandoned upstream."; # added 2022-02-06
gnome-passwordsafe = gnome-secrets; # added 2022-01-30
- gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10
- gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
- gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # added 2022-01-15
- gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
- gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
- gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
- gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27
- # Added 2020-10-16
+ gnome-mpv = celluloid; # Added 2019-08-22
+ gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15
+ gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14
+ gnome_user_docs = gnome-user-docs; # Added 2019-11-20
+ gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2019-12-10
+ gnome_doc_utils = gnome-doc-utils; # Added 2018-02-25
+ gnome_themes_standard = gnome-themes-standard; # Added 2018-02-25
+ gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # Added 2019-05-27
+
gnuradio-with-packages = gnuradio3_7.override {
extraPackages = lib.attrVals [
"osmosdr" "ais" "gsm" "nacl" "rds" "limesdr"
] gnuradio3_7Packages;
- };
- gnuradio-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16
- gnuradio-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16
- gnuradio-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16
- gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16
- gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16
- gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16
- gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # added 2022-01-16
- gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16
- gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16
- gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16
- gr-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16
- gr-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16
- gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16
- gnustep-make = gnustep.make; # added 2016-7-6
- gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
- gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14
+ }; # Added 2020-10-16
+
gmock = gtest; # moved from top-level 2021-03-14
- go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
- go-pup = pup; # added 2017-12-19
- gobby5 = gobby; # added 2021-02-01
- gobjectIntrospection = gobject-introspection; # added 2018-12-02
- gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # added 2021-12-15
- goimports = gotools; # added 2018-09-16
- gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23
- google-gflags = gflags; # added 2019-07-25
- google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07
- google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07
- googleAuthenticator = google-authenticator; # added 2016-10-16
- googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # added 2022-01-22
- gpgstats = throw "gpgstats has been removed: upstream is gone"; # added 2022-02-06
- grantlee5 = libsForQt5.grantlee; # added 2015-12-19
- graalvm8 = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19
- graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # added 2021-10-19
+
+ gnome3 = gnome; # Added 2021-05-07
+ gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12
+ gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16
+ gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
+ gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
+ gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
+ gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
+ gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
+ gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
+ gnustep-make = gnustep.make; # Added 2016-7-6
+ gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14
+ gobby5 = gobby; # Added 2021-02-01
+ gobjectIntrospection = gobject-introspection; # Added 2018-12-02
+ gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15
+ goimports = gotools; # Added 2018-09-16
+ gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23
+ googleAuthenticator = google-authenticator; # Added 2016-10-16
+ googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22
+ google-gflags = gflags; # Added 2019-07-25
+ google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+ google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+ go-pup = pup; # Added 2017-12-19
+ gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
+
graalvm11 = graalvm11-ce;
- grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # added 2022-01-05
- gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
- gtk_doc = gtk-doc; # added 2018-02-25
- gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01
- guileCairo = guile-cairo; # added 2017-09-24
- guileGnome = throw "guile-gnome has been removed"; # 2022-01-16
- guile-gnome = throw "guile-gnome has been removed"; # 2022-01-16
- gnome3 = gnome; # added 2021-05-07
- guileLint = guile-lint; # added 2017-09-27
- guile_lib = guile-lib; # added 2017-09-24
- guile_ncurses = guile-ncurses; # added 2017-09-24
- gupnp_av = gupnp-av; # added 2018-02-25
- gupnp_dlna = gupnp-dlna; # added 2018-02-25
- gupnp_igd = gupnp-igd; # added 2018-02-25
- gupnptools = gupnp-tools; # added 2015-12-19
- gutenberg = zola; # added 2018-11-17
- gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # added 2022-02-06
- gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # added 2022-02-06
- hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # added 2022-01-15
- hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
- heimdalFull = heimdal; # added 2018-05-01
+ graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
+ graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
+ gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
+ grantlee5 = libsForQt5.grantlee; # Added 2015-12-19
+ gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
+ grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05
+ gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
+ gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
+ gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
+ gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
+ gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25
+ gtk_doc = gtk-doc; # Added 2018-02-25
+ gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
+ gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10
+ guileCairo = guile-cairo; # Added 2017-09-24
+ guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16
+ guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16
+ guile_lib = guile-lib; # Added 2017-09-24
+ guileLint = guile-lint; # Added 2017-09-27
+ guile_ncurses = guile-ncurses; # Added 2017-09-24
+ gupnp_av = gupnp-av; # Added 2018-02-25
+ gupnp_dlna = gupnp-dlna; # Added 2018-02-25
+ gupnp_igd = gupnp-igd; # Added 2018-02-25
+ gupnptools = gupnp-tools; # Added 2015-12-19
+ gutenberg = zola; # Added 2018-11-17
+ gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06
+ gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06
+
+ ### H ###
+
+ hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
+ hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
+ heimdalFull = heimdal; # Added 2018-05-01
heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06
- hepmc = hepmc2; # added 2019-08-05
- hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11
- hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
- holochain-go = throw "holochain-go was abandoned by upstream"; # added 2022-01-01
- ht-rust = xh; # added 2021-02-13
- htmlTidy = html-tidy; # added 2014-12-06
- hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06
- iana_etc = iana-etc; # added 2017-03-08
- iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08
- icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
- icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
- idea = jetbrains; # added 2017-04-03
- imagemagick7_light = imagemagick_light; # added 2021-02-22
- imagemagick7 = imagemagick; # added 2021-02-22
- imagemagick7Big = imagemagickBig; # added 2021-02-22
- impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # added 2022-01-27
+ hepmc = hepmc2; # Added 2019-08-05
+ hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11
+ hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25
+ holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01
+ htmlTidy = html-tidy; # Added 2014-12-06
+ ht-rust = xh; # Added 2021-02-13
+ hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06
+
+ ### I ###
+
+ iana_etc = iana-etc; # Added 2017-03-08
+ iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
+ icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
+ icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
+ idea = jetbrains; # Added 2017-04-03
+ imagemagick7Big = imagemagickBig; # Added 2021-02-22
+ imagemagick7 = imagemagick; # Added 2021-02-22
+ imagemagick7_light = imagemagick_light; # Added 2021-02-22
+ impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
+ i-score = throw "i-score has been removed: abandoned upstream."; # Added 2020-11-21
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
- infiniband-diags = rdma-core; # added 2019-08-09
+ infiniband-diags = rdma-core; # Added 2019-08-09
+ ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # Added 2022-01-12
inotifyTools = inotify-tools;
- inter-ui = inter; # added 2021-03-27
- iops = throw "iops was removed: upstream is gone"; # added 2022-02-06
+ inter-ui = inter; # Added 2021-03-27
+ iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06
iproute = iproute2; # moved from top-level 2021-03-14
- ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # added 2021-12-15
- i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
+ ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15
+
+ ### J ###
+
+
jack2Full = jack2; # moved from top-level 2021-03-14
- jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
- jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15
- jbuilder = dune_1; # added 2018-09-09
+ jamomacore = throw "jamomacore has been removed: abandoned upstream."; # Added 2020-11-21
+ jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15
+ jbuilder = dune_1; # Added 2018-09-09
+ jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # Added 2021-04-26
jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
- joseki = apache-jena-fuseki; # added 2016-02-28
+ joseki = apache-jena-fuseki; # Added 2016-02-28
journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead.";
- jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
- json_glib = json-glib; # added 2018-02-25
- kafkacat = kcat; # added 2021-10-07
- kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
- keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-01
- k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
- kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09
+
+ # Julia
+ julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15
+ julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13
+ julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15
+ julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13
+ julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02
+
+ json_glib = json-glib; # Added 2018-02-25
+ jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15
+
+ ### K ###
+
+ k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04
+ k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06
+ kafkacat = kcat; # Added 2021-10-07
+ kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11
+ kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28
+ kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16
+ kdiff3-qt5 = kdiff3; # Added 2017-02-18
+ keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
+ keepassx-community = keepassxc; # Added 2017-11
+ keepassx-reboot = keepassx-community; # Added 2017-02-01
+ keepassx2-http = keepassx-reboot; # Added 2016-10-17
+ keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-01
+ kerberos = libkrb5; # moved from top-level 2021-03-14
+ kexectools = kexec-tools; # Added 2021-09-03
+ keybase-go = keybase; # Added 2016-08-24
+ keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # Added 2019-12-10
+ keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
+ kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
+ kicad-with-packages3d = kicad; # Added 2019-11-25
+ kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # Added 2021-03-09
+ kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # Added 2020-04-28
+ kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25
+ knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # Added 2022-01-01
kodiGBM = kodi-gbm;
kodiPlain = kodi;
kodiPlainWayland = kodi-wayland;
- ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # added 2022-01-12
- jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26
- julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # added 2020-09-15
- julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13
- julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15
- julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13
- julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02
- k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # added 2022-01-04
- kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11
- kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
- kdiff3-qt5 = kdiff3; # added 2017-02-18
- keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
- keepassx-community = keepassxc; # added 2017-11
- keepassx-reboot = keepassx-community; # added 2017-02-01
- keepassx2-http = keepassx-reboot; # added 2016-10-17
- kexectools = kexec-tools; # added 2021-09-03
- keybase-go = keybase; # added 2016-08-24
- keysmith = libsForQt5.plasmaMobileGear.keysmith; # added 2021-07-14
- kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
- kicad-with-packages3d = kicad; # added 2019-11-25
- kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09
- kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25
- knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned."; # 2022-01-01
- krename-qt5 = krename; # added 2017-02-18
- kerberos = libkrb5; # moved from top-level 2021-03-14
- keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10
- kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23
+ kodiPlugins = kodiPackages; # Added 2021-03-09;
+ kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23
+ krename-qt5 = krename; # Added 2017-02-18
krita-beta = krita; # moved from top-level 2021-12-23
- kvm = qemu_kvm; # added 2018-04-25
- lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # added 2022-01-01
+ kvm = qemu_kvm; # Added 2018-04-25
+
+ ### L ###
+
+ lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
latinmodern-math = lmmath;
- letsencrypt = certbot; # added 2016-05-16
- libaudit = audit; # added 2018-04-25
- libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
- libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
- libcap_manpages = libcap.doc; # added 2016-04-29
- libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
- libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # added 2020-03-04
- libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
- libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
- libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
- libcap_progs = libcap.out; # added 2016-04-29
- libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16
- libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
- libdbusmenu-glib = libdbusmenu; # added 2018-05-01
- liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
- liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
- liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
- libgksu = throw "libgksu has been removed"; # added 2022-01-16
- libgnome_keyring = libgnome-keyring; # added 2018-02-25
- libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
- libgpgerror = libgpg-error; # added 2021-09-04
- libgumbo = gumbo; # added 2018-01-21
- libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # added 2022-01-21
- libGL_driver = mesa.drivers; # added 2019-05-28
- libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
- libjpeg_drop = libjpeg_original; # added 2020-06-05
- libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
- libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # added 2021-11-09
- liblapackWithoutAtlas = lapack-reference; # added 2018-11-05
- liblastfm = libsForQt5.liblastfm; # added 2020-06-14
- liblrdf = lrdf; # added 2018-04-25
+ letsencrypt = certbot; # Added 2016-05-16
+ libGL_driver = mesa.drivers; # Added 2019-05-28
+ libaudit = audit; # Added 2018-04-25
+ libcanberra_gtk2 = libcanberra-gtk2; # Added 2018-02-25
+ libcanberra_gtk3 = libcanberra-gtk3; # Added 2018-02-25
+ libcap_manpages = libcap.doc; # Added 2016-04-29
+ libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29
+ libcap_progs = libcap.out; # Added 2016-04-29
+ libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # Added 2021-05-16
+ libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # Added 2020-03-04
+ libdbusmenu-glib = libdbusmenu; # Added 2018-05-01
+ libdbusmenu_qt5 = libsForQt5.libdbusmenu; # Added 2015-12-19
+ liberation_ttf_v1_from_source = liberation_ttf_v1; # Added 2018-12-12
+ liberation_ttf_v2_from_source = liberation_ttf_v2; # Added 2018-12-12
+ liberationsansnarrow = liberation-sans-narrow; # Added 2018-12-12
+ libgksu = throw "libgksu has been removed"; # Added 2022-01-16
+ libgnome_keyring = libgnome-keyring; # Added 2018-02-25
+ libgnome_keyring3 = libgnome-keyring3; # Added 2018-02-25
+ libgpgerror = libgpg-error; # Added 2021-09-04
+ libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21
+ libgumbo = gumbo; # Added 2018-01-21
+ libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10
+ libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10
+ libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10
+ libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14
+ libjpeg_drop = libjpeg_original; # Added 2020-06-05
+ libjson_rpc_cpp = libjson-rpc-cpp; # Added 2017-02-28
+ libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2021-11-09
+ liblapackWithoutAtlas = lapack-reference; # Added 2018-11-05
+ liblastfm = libsForQt5.liblastfm; # Added 2020-06-14
+ liblrdf = lrdf; # Added 2018-04-25
+ libmsgpack = msgpack; # Added 2018-08-17
libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend";
- libqrencode = qrencode; # added 2019-01-01
- librdf = lrdf; # added 2020-03-22
- librecad2 = librecad; # backwards compatibility alias, added 2015-10
- librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24
- libseat = seatd; # added 2021-06-24
- libsysfs = sysfsutils; # added 2018-04-25
- libtidy = html-tidy; # added 2014-12-21
+ libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09
+ libqrencode = qrencode; # Added 2019-01-01
+ librdf = lrdf; # Added 2020-03-22
+ librecad2 = librecad; # backwards compatibility alias, added 2015-10
+ librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24
+ libseat = seatd; # Added 2021-06-24
+ libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # Added 2019-12-10
+ libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # Added 2020-06-22
+ libsysfs = sysfsutils; # Added 2018-04-25
+ libtidy = html-tidy; # Added 2014-12-21
+ libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20
+ libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # Added 2020-12-20
+ libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20
+ libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20
libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa";
libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa";
- libudev = udev; # added 2018-04-25
- libungif = giflib; # added 2020-02-12
- libusb = libusb1; # added 2020-04-28
- libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
- libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
- libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
+ libudev = udev; # Added 2018-04-25
+ libungif = giflib; # Added 2020-02-12
+ libusb = libusb1; # Added 2020-04-28
+ libva-full = libva; # Added 2018-03-26
+ libva1-full = libva1; # Added 2018-03-26
libwnck3 = libwnck;
- lilypond-unstable = lilypond; # added 2021-03-11
- lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14
- lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14
- links = links2; # added 2016-01-31
- linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09
- linux_rpi0 = linuxKernel.kernels.linux_rpi1;
+ lilypond-unstable = lilypond; # Added 2021-03-11
+ lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14
+ lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # Added 2022-01-14
+ links = links2; # Added 2016-01-31
+ linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # Added 2021-12-09
+
+ # Linux kernels
+ linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
+ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
+ linuxPackages_4_14 = linuxKernel.packages.linux_4_14;
+ linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
+ linuxPackages_4_4 = linuxKernel.packages.linux_4_4;
+ linuxPackages_4_9 = linuxKernel.packages.linux_4_9;
+ linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
+ linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
+ linuxPackages_5_16 = linuxKernel.packages.linux_5_16;
+ linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
+ linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
- linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
- linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4;
- linuxPackages_4_4 = linuxKernel.packages.linux_4_4;
- linuxPackages_4_9 = linuxKernel.packages.linux_4_9;
- linuxPackages_4_14 = linuxKernel.packages.linux_4_14;
- linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
- linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
- linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
- linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
- linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
- linuxPackages_5_16 = linuxKernel.packages.linux_5_16;
-
+ linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
+ linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
+ linux_4_14 = linuxKernel.kernels.linux_4_14;
+ linux_4_19 = linuxKernel.kernels.linux_4_19;
+ linux_4_4 = linuxKernel.kernels.linux_4_4;
+ linux_4_9 = linuxKernel.kernels.linux_4_9;
+ linux_5_10 = linuxKernel.kernels.linux_5_10;
+ linux_5_15 = linuxKernel.kernels.linux_5_15;
+ linux_5_16 = linuxKernel.kernels.linux_5_16;
+ linux_5_4 = linuxKernel.kernels.linux_5_4;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
+ linux_rpi0 = linuxKernel.kernels.linux_rpi1;
linux_rpi1 = linuxKernel.kernels.linux_rpi1;
linux_rpi2 = linuxKernel.kernels.linux_rpi2;
linux_rpi3 = linuxKernel.kernels.linux_rpi3;
linux_rpi4 = linuxKernel.kernels.linux_rpi4;
- linux_4_4 = linuxKernel.kernels.linux_4_4;
- linux_4_9 = linuxKernel.kernels.linux_4_9;
- linux_4_14 = linuxKernel.kernels.linux_4_14;
- linux_4_19 = linuxKernel.kernels.linux_4_19;
- linux_5_4 = linuxKernel.kernels.linux_5_4;
- linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
- linux_5_10 = linuxKernel.kernels.linux_5_10;
- linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
- linux_5_15 = linuxKernel.kernels.linux_5_15;
- linux_5_16 = linuxKernel.kernels.linux_5_16;
- # added 2020-04-04
+ # Added 2020-04-04
linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened";
linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened";
- # added 2021-04-04
+ # Added 2021-04-04
linuxPackages_xen_dom0 = linuxPackages;
linuxPackages_latest_xen_dom0 = linuxPackages_latest;
linuxPackages_xen_dom0_hardened = linuxPackages_hardened;
linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened;
- # added 2021-08-16
+ # Added 2021-08-16
linuxPackages_latest_hardened = throw ''
The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
frequently lag behind the upstream kernel. In some cases this meant that this attribute
@@ -589,176 +669,201 @@ mapAliases ({
'';
linux_latest_hardened = linuxPackages_latest_hardened;
- linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22
- loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- lobster-two = google-fonts; # added 2021-07-22
- lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15
- lttngTools = lttng-tools; # added 2014-07-31
- lttngUst = lttng-ust; # added 2014-07-31
- lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
- lua5_expat = luaPackages.luaexpat; # added 2017-05-02
- lua5_sec = luaPackages.luasec; # added 2017-05-02
- lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12
- love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15
- love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15
- love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # added 2022-01-15
- lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03
+ linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22
+
+ loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ lobster-two = google-fonts; # Added 2021-07-22
+ love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15
+ love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15
+ love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15
+ lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15
+ lttngTools = lttng-tools; # Added 2014-07-31
+ lttngUst = lttng-ust; # Added 2014-07-31
+ lua5_1_sockets = lua51Packages.luasocket; # Added 2017-05-02
+ lua5_expat = luaPackages.luaexpat; # Added 2017-05-02
+ lua5_sec = luaPackages.luasec; # Added 2017-05-02
+ lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12
+ lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03
lzma = xz; # moved from top-level 2021-03-14
- m3d-linux = m33-linux; # added 2016-08-13
- mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # added 2021-08-21
- mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12
- man_db = man-db; # added 2016-05
- manpages = man-pages; # added 2015-12-06
- marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15
- mysql = mariadb; # moved from top-level 2021-03-14
+
+ ### M ###
+
+ m3d-linux = m33-linux; # Added 2016-08-13
+ mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21
+ mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2."; # Added 2022-01-12
+ man_db = man-db; # Added 2016-05
+ manpages = man-pages; # Added 2015-12-06
+ marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
- mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15
- matrique = spectral; # added 2020-01-27
- mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
+ mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
+ matrique = spectral; # Added 2020-01-27
+ mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # Added 2019-12-08
+ mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23
+ mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # Added 2019-12-10, modified 2020-11-25
mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04
- meme = meme-image-generator; # added 2021-04-21
- mess = mame; # added 2019-10-30
- metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # added 2022-01-12
- mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23
- mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25
- mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # added 2022-01-12
- mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # added 2022-01-01
- mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
- minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
- minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
- minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14
- monero = monero-cli; # added 2021-11-28
- monodevelop = throw "monodevelop has been removed from nixpgks"; # added 2022-01-15
- mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07
- mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
- mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
+ meme = meme-image-generator; # Added 2021-04-21
+ memtest86 = memtest86plus; # Added 2019-05-08
+ mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18
+ mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
+ mess = mame; # Added 2019-10-30
+ metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # Added 2022-01-12
+ mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it."; # Added 2022-01-12
+ midoriWrapper = midori; # Added 2015-01
+ mime-types = mailcap; # Added 2022-01-21
+ mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2."; # Added 2022-01-01
+ minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13
+ minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13
+ minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14
+ mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10
+ mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15
+ mlt-qt5 = libsForQt5.mlt; # Added 2015-12-19
+ mobile_broadband_provider_info = mobile-broadband-provider-info; # Added 2018-02-25
+ moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead.";
+ module_init_tools = kmod; # Added 2016-04-22
+ monero = monero-cli; # Added 2021-11-28
+ monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15
+ mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+ mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18
+ mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # Added 2020-10-18
+
+ morituri = whipper; # Added 2018-09-13
+ mozart-binary = mozart2-binary; # Added 2019-09-23
+ mozart = mozart2-binary; # Added 2019-09-23
+ mpc_cli = mpc-cli; # moved from top-level 2022-01-24
+ mpd_clientlib = libmpdclient; # Added 2021-02-11
+ mpich2 = mpich; # Added 2018-08-06
+ msf = metasploit; # Added 2018-04-25
+ multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
+ mumble_git = pkgs.mumble; # Added 2019-08-01
+ murmur_git = pkgs.murmur; # Added 2019-08-01
mysql-client = hiPrio mariadb.client;
- memtest86 = memtest86plus; # added 2019-05-08
- mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # added 2021-10-18
- mesa_noglu = mesa; # added 2019-05-28
+ mysql = mariadb; # moved from top-level 2021-03-14
+
# NOTE: 2018-07-12: legacy alias:
# grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/
+
# floating point textures patents are expired,
# so package reduced to alias
mesa_drivers = mesa.drivers;
- mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15
- midoriWrapper = midori; # added 2015-01
- mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # added 2020-08-15
- mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
- mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
- moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead.";
- module_init_tools = kmod; # added 2016-04-22
- mozart = mozart2-binary; # added 2019-09-23
- mozart-binary = mozart2-binary; # added 2019-09-23
- mpc_cli = mpc-cli; # moved from top-level 2022-01-24
- mpd_clientlib = libmpdclient; # added 2021-02-11
- mpich2 = mpich; # added 2018-08-06
- msf = metasploit; # added 2018-04-25
- libmsgpack = msgpack; # added 2018-08-17
- mssys = ms-sys; # added 2015-12-13
- mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
- multipath_tools = multipath-tools; # added 2016-01-21
- mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18
- mupen64plus1_5 = mupen64plus; # added 2016-02-12
- mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
- mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
- mysqlWorkbench = mysql-workbench; # added 2017-01-19
+ mesa_noglu = mesa; # Added 2019-05-28
+
+ mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22
+ mssys = ms-sys; # Added 2015-12-13
+ multipath_tools = multipath-tools; # Added 2016-01-21
+ mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18
+ mupen64plus1_5 = mupen64plus; # Added 2016-02-12
+ mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15
+ mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # Added 2021-04-15
+ mysqlWorkbench = mysql-workbench; # Added 2017-01-19
+
+ ### N ###
+
+ net_snmp = net-snmp; # Added 2019-12-21
nagiosPluginsOfficial = monitoring-plugins;
- navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07
- ncat = nmap; # added 2016-01-26
- neap = throw "neap was removed from nixpkgs, as it relies on python2"; # added 2022-01-12
- netcat-openbsd = libressl.nc; # added 2018-04-25
- netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31
- networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
- networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
- networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
- networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
- networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
- networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
- neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- nfsUtils = nfs-utils; # added 2014-12-06
- nginxUnstable = nginxMainline; # added 2018-04-25
- nilfs_utils = nilfs-utils; # added 2018-04-25
+ navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
+ ncat = nmap; # Added 2016-01-26
+ neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
+ netcat-openbsd = libressl.nc; # Added 2018-04-25
+ netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
+ networkmanager_fortisslvpn = networkmanager-fortisslvpn; # Added 2018-02-25
+ networkmanager_iodine = networkmanager-iodine; # Added 2018-02-25
+ networkmanager_l2tp = networkmanager-l2tp; # Added 2018-02-25
+ networkmanager_openconnect = networkmanager-openconnect; # Added 2018-02-25
+ networkmanager_openvpn = networkmanager-openvpn; # Added 2018-02-25
+ networkmanager_vpnc = networkmanager-vpnc; # Added 2018-02-25
+ neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ nfsUtils = nfs-utils; # Added 2014-12-06
+ nginxUnstable = nginxMainline; # Added 2018-04-25
+ nilfs_utils = nilfs-utils; # Added 2018-04-25
nix-direnv-flakes = nix-direnv;
- nix-review = nixpkgs-review; # added 2019-12-22
- nixFlakes = nixVersions.stable; # added 2021-05-21
- nixStable = nixVersions.stable; # added 2022-01-24
- nixUnstable = nixVersions.unstable; # added 2022-01-26
+ nix-review = nixpkgs-review; # Added 2019-12-22
+ nixFlakes = nixVersions.stable; # Added 2021-05-21
+ nixStable = nixVersions.stable; # Added 2022-01-24
+ nixUnstable = nixVersions.unstable; # Added 2022-01-26
nix_2_3 = nixVersions.nix_2_3;
nix_2_4 = nixVersions.nix_2_4;
nix_2_5 = nixVersions.nix_2_5;
nix_2_6 = nixVersions.nix_2_6;
- nmap_graphical = nmap-graphical; # added 2017-01-19
- nmap-unfree = nmap; # added 2021-04-06
- nologin = shadow; # added 2018-04-25
- nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
- nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15
- noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16
- now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
- nxproxy = nx-libs; # added 2019-02-15
+ nmap-unfree = nmap; # Added 2021-04-06
+ nmap_graphical = nmap-graphical; # Added 2017-01-19
+ nologin = shadow; # Added 2018-04-25
+ nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
+ noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16
+ nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15
+ now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05
+ nxproxy = nx-libs; # Added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
- oauth2_proxy = oauth2-proxy; # added 2021-04-18
- opencascade_oce = opencascade; # added 2018-04-25
- oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
- octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24
+
+ ### O ###
+
+ oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # Added 2020-10-09
+ OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16
+ OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16
+ oauth2_proxy = oauth2-proxy; # Added 2021-04-18
+ oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # Added 2019-12-10
+ octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # Added 2021-01-24
+ ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12
ofp = throw "ofp is not compatible with odp-dpdk";
- olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
- openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06
- openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # added 2022-01-06
- opencl-icd = ocl-icd; # added 2017-01-20
- openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
- openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10
- openexr_ctl = ctl; # added 2018-04-25
- openisns = open-isns; # added 2020-01-28
- openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
- openjpeg_2 = openjpeg; # added 2021-01-25
- openmpt123 = libopenmpt; # added 2021-09-05
- opensans-ttf = open-sans; # added 2018-12-04
- openssh_with_kerberos = openssh; # added 2018-01-28
- orchis = orchis-theme; # added 2021-06-09
- onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04
- osquery = throw "osquery has been removed."; # added 2019-11-24
- osxfuse = macfuse-stubs; # added 2021-03-20
- otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
- OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16
- OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16
- owncloudclient = owncloud-client; # added 2016-08
- ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12
- p11_kit = p11-kit; # added 2018-02-25
- packet-cli = metal-cli; # added 2021-10-25
- paperless = paperless-ng; # added 2021-06-06
- parity = openethereum; # added 2020-08-01
- parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10
- parquet-cpp = arrow-cpp; # added 2018-09-08
- pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
- pdfmod = throw "pdfmod has been removed"; # added 2022-01-15
- pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22
- pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # added 2022-01-01
- pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03
- perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
- perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
- pgp-tools = signing-party; # added 2017-03-26
- pg_tmp = ephemeralpg; # added 2018-01-16
+ olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05
+ onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04
+ openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
+ openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
+ opencascade_oce = opencascade; # Added 2018-04-25
+ opencl-icd = ocl-icd; # Added 2017-01-20
+ openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21
+ openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10
+ openexr_ctl = ctl; # Added 2018-04-25
+ openisns = open-isns; # Added 2020-01-28
+ openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24
+ openjpeg_2 = openjpeg; # Added 2021-01-25
+ openmpt123 = libopenmpt; # Added 2021-09-05
+ opensans-ttf = open-sans; # Added 2018-12-04
+ openssh_with_kerberos = openssh; # Added 2018-01-28
+ orchis = orchis-theme; # Added 2021-06-09
+ osquery = throw "osquery has been removed."; # Added 2019-11-24
+ osxfuse = macfuse-stubs; # Added 2021-03-20
+ otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02
+ owncloudclient = owncloud-client; # Added 2016-08
+
+ ### P ###
+
+ PPSSPP = ppsspp; # Added 2017-10-01
+
+ p11_kit = p11-kit; # Added 2018-02-25
+ packet-cli = metal-cli; # Added 2021-10-25
+ paperless = paperless-ng; # Added 2021-06-06
+ parity = openethereum; # Added 2020-08-01
+ parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10
+ parquet-cpp = arrow-cpp; # Added 2018-09-08
+ pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # Added 2018-05-04
+ pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15
+ pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22
+ pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # Added 2022-01-01
+ pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03
+ perlXMLParser = perlPackages.XMLParser; # Added 2018-10-12
+ perlArchiveCpio = perlPackages.ArchiveCpio; # Added 2018-10-12
+ pgp-tools = signing-party; # Added 2017-03-26
+ pg_tmp = ephemeralpg; # Added 2018-01-16
# Obsolete PHP version aliases
- php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03
- php73Packages = php73; # added 2021-06-03
- php73Extensions = php73; # added 2021-06-03
+ php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # Added 2021-06-03
+ php73Packages = php73; # Added 2021-06-03
+ php73Extensions = php73; # Added 2021-06-03
php-embed = throw ''
php*-embed has been dropped, you can build something similar
with the following snippet:
php74.override { embedSupport = true; apxs2Support = false; }
- ''; # added 2020-04-01
- php73-embed = php-embed; # added 2020-04-01
- php74-embed = php-embed; # added 2020-04-01
+ ''; # Added 2020-04-01
+ php73-embed = php-embed; # Added 2020-04-01
+ php74-embed = php-embed; # Added 2020-04-01
phpPackages-embed = throw ''
php*Packages-embed has been dropped, you can build something
similar with the following snippet:
(php74.override { embedSupport = true; apxs2Support = false; }).packages
- ''; # added 2020-04-01
+ ''; # Added 2020-04-01
php73Packages-embed = phpPackages-embed;
php74Packages-embed = phpPackages-embed;
@@ -773,9 +878,9 @@ mapAliases ({
cgiSupport = false;
fpmSupport = false;
}
- ''; # added 2020-04-01
- php73-unit = php-unit; # added 2020-04-01
- php74-unit = php-unit; # added 2020-04-01
+ ''; # Added 2020-04-01
+ php73-unit = php-unit; # Added 2020-04-01
+ php74-unit = php-unit; # Added 2020-04-01
phpPackages-unit = throw ''
php*Packages-unit has been dropped, you can build something
@@ -788,194 +893,195 @@ mapAliases ({
cgiSupport = false;
fpmSupport = false;
}).packages
- ''; # added 2020-04-01
+ ''; # Added 2020-04-01
php73Packages-unit = phpPackages-unit;
php74Packages-unit = phpPackages-unit;
- pidgin-with-plugins = pidgin; # added 2016-06
- pidginlatex = pidgin-latex; # added 2018-01-08
- pidginlatexSF = pidgin-latex; # added 2014-11-02
- pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08
- pidginosd = pidgin-osd; # added 2018-01-08
- pidginotr = pidgin-otr; # added 2018-01-08
- pidginsipe = pidgin-sipe; # added 2018-01-08
- pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
- pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # added 2022-01-19
- piwik = matomo; # added 2018-01-16
- pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18
- pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02
- planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02
- pleroma-otp = pleroma; # added 2021-07-10
- pltScheme = racket; # just to be sure
+ pidgin-with-plugins = pidgin; # Added 2016-06
+ pidginlatex = pidgin-latex; # Added 2018-01-08
+ pidginlatexSF = pidgin-latex; # Added 2014-11-02
+ pidginmsnpecan = pidgin-msn-pecan; # Added 2018-01-08
+ pidginosd = pidgin-osd; # Added 2018-01-08
+ pidginotr = pidgin-otr; # Added 2018-01-08
+ pidginsipe = pidgin-sipe; # Added 2018-01-08
+ pidginwindowmerge = pidgin-window-merge; # Added 2018-01-08
+ pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # Added 2022-01-19
+ piwik = matomo; # Added 2018-01-16
+ pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18
+ pkgconfigUpstream = pkg-configUpstream; # Added 2018-02-02
+ planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # Added 2021-02-02
+ pleroma-otp = pleroma; # Added 2021-07-10
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
- pmtools = acpica-tools; # added 2018-11-01
- polarssl = mbedtls; # added 2018-04-25
- polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # added 2022-01-01
- poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
+ pltScheme = racket; # just to be sure
+ pmtools = acpica-tools; # Added 2018-11-01
+ polarssl = mbedtls; # Added 2018-04-25
+ polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project."; # Added 2022-01-01
+ poppler_qt5 = libsForQt5.poppler; # Added 2015-12-19
+
+ # postgresql
postgresql96 = postgresql_9_6;
- postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # added 2021-12-03
+ postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03
+
# postgresql plugins
- pgjwt = postgresqlPackages.pgjwt;
+ cstore_fdw = postgresqlPackages.cstore_fdw;
+ pg_cron = postgresqlPackages.pg_cron;
+ pg_hll = postgresqlPackages.pg_hll;
pg_repack = postgresqlPackages.pg_repack;
- pgroonga = postgresqlPackages.pgroonga;
pg_similarity = postgresqlPackages.pg_similarity;
+ pg_topn = postgresqlPackages.pg_topn;
+ pgjwt = postgresqlPackages.pgjwt;
+ pgroonga = postgresqlPackages.pgroonga;
pgtap = postgresqlPackages.pgtap;
plv8 = postgresqlPackages.plv8;
- tilp2 = throw "tilp2 has been removed"; # added 2022-01-15
- timekeeper = throw "timekeeper has been removed"; # added 2022-01-16
+ postgis = postgresqlPackages.postgis;
+ tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15
+ timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16
timescaledb = postgresqlPackages.timescaledb;
tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns";
tsearch_extras = postgresqlPackages.tsearch_extras;
- cstore_fdw = postgresqlPackages.cstore_fdw;
- pg_hll = postgresqlPackages.pg_hll;
- pg_cron = postgresqlPackages.pg_cron;
- pg_topn = postgresqlPackages.pg_topn;
- pinentry_curses = pinentry-curses; # added 2019-10-14
- pinentry_emacs = pinentry-emacs; # added 2019-10-14
- pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14
- pinentry_qt = pinentry-qt; # added 2019-10-14
- pinentry_gnome = pinentry-gnome; # added 2019-10-14
- pinentry_qt5 = pinentry-qt; # added 2020-02-11
- postgis = postgresqlPackages.postgis;
- # end
- privateer = throw "privateer was removed because it was broken"; # added 2021-05-18
- processing3 = processing; # added 2019-08-16
- procps-ng = procps; # added 2018-06-08
- proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # added 2021-06-30
- proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # added 2021-04-12
- prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16
- pygmentex = texlive.bin.pygmentex; # added 2019-12-15
- pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # added 2021-03-21
+
+ phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # Added 2019-11-22
+ phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # Added 2019-11-22
+ phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # Added 2019-11-22
+ pinentry_curses = pinentry-curses; # Added 2019-10-14
+ pinentry_emacs = pinentry-emacs; # Added 2019-10-14
+ pinentry_gnome = pinentry-gnome; # Added 2019-10-14
+ pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14
+ pinentry_qt = pinentry-qt; # Added 2019-10-14
+ pinentry_qt5 = pinentry-qt; # Added 2020-02-11
+ pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # Added 2019-12-10
+ privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18
+ processing3 = processing; # Added 2019-08-16
+ procps-ng = procps; # Added 2018-06-08
+ proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30
+ proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead."; # Added 2021-04-12
+ prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # Added 2021-03-16
+ pulseaudioLight = pulseaudio; # Added 2018-04-25
+ pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # Added 2021-02-13
+ pulseeffects-pw = easyeffects; # Added 2021-07-07
+ pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
+ pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only";
+ pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14
+ pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # Added 2022-01-01
+ pygmentex = texlive.bin.pygmentex; # Added 2019-12-15
+ pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # Added 2021-03-21
+ pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # Added 2020-10-24
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
- pulseaudioLight = pulseaudio; # added 2018-04-25
- pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # added 2021-02-13
- pulseeffects-pw = easyeffects; # added 2021-07-07
- phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
- phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
- phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22
- pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # added 2021-05-14
- pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2."; # added 2022-01-01
- pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
- pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
- pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
- pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12
- pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01
- python = python2; # added 2022-01-11
- python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08
- python-swiftclient = swiftclient; # added 2021-09-09
- pythonFull = python2Full; # added 2022-01-11
- pythonPackages = python.pkgs; # added 2022-01-11
- quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22
- qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
- qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
- qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02
- qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02
- qt5ct = libsForQt5.qt5ct; # added 2021-12-27
- quake3game = ioquake3; # added 2016-01-14
- quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-03
- qvim = throw "qvim has been removed."; # added 2020-08-31
- qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08
- qwt6 = libsForQt5.qwt; # added 2015-12-19
- qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04
- qtcurve = libsForQt5.qtcurve; # added 2020-11-07
- quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
- raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24
- rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # added 2022-01-01
- rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
- rdiff_backup = rdiff-backup; # added 2014-11-23
- rdmd = dtools; # added 2017-08-19
- readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22
- rng_tools = rng-tools; # added 2018-10-24
+ pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12
+ pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12
+ pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-12
+ pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # Added 2022-01-01
+ python = python2; # Added 2022-01-11
+ python-swiftclient = swiftclient; # Added 2021-09-09
+ python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # Added 2021-03-08
+ pythonFull = python2Full; # Added 2022-01-11
+ pythonPackages = python.pkgs; # Added 2022-01-11
+
+ ### Q ###
+
+ QmidiNet = qmidinet; # Added 2016-05-22
+ qca-qt5 = libsForQt5.qca-qt5; # Added 2015-12-19
+ qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05
+ qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02
+ qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02
+ qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15
+ qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10
+ qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
+ qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
+ qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04
+ quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22
+ quake3game = ioquake3; # Added 2016-01-14
+ quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09
+ quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-03
+ qvim = throw "qvim has been removed."; # Added 2020-08-31
+ qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08
+ qwt6 = libsForQt5.qwt; # Added 2015-12-19
+
+ ### R ###
+
+ radare2-cutter = cutter; # Added 2021-03-30
+ raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24
+ rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2."; # Added 2022-01-01
+ rdf4store = throw "rdf4store has been removed from nixpkgs."; # Added 2019-12-21
+ rdiff_backup = rdiff-backup; # Added 2014-11-23
+ rdmd = dtools; # Added 2017-08-19
+ readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22
+ recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10
+ redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
+ redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
+ renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # Added 2022-01-12
+ residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
+ retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19
+ retroshare06 = retroshare;
+ rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23
+ riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14
+ rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15
+ ring-daemon = jami-daemon; # Added 2021-10-26
+ rkt = throw "rkt was archived by upstream"; # Added 2020-05-16
+ rng_tools = rng-tools; # Added 2018-10-24
robomongo = robo3t; #added 2017-09-28
rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21
+ rpiboot-unstable = rpiboot; # Added 2021-07-30
rssglx = rss-glx; #added 2015-03-25
- rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25
- # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
- # due to it being inside the linuxPackagesFor function.
- rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14
- recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
- residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27
- retroshare06 = retroshare;
- gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
- qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
- qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
- rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
- rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # added 2022-01-15
- riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
- ring-daemon = jami-daemon; # added 2021-10-26
- radare2-cutter = cutter; # added 2021-03-30
- redkite = throw "redkite was archived by upstream"; # added 2021-04-12
- redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # added 2021-12-25
- renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2."; # added 2022-01-12
- retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19
- rkt = throw "rkt was archived by upstream"; # added 2020-05-16
- rpiboot-unstable = rpiboot; # added 2021-07-30
- rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08
- rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
+ rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25
+ rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08
rubyMinimal = throw "rubyMinimal was removed due to being unused";
+ rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
runCommandNoCC = runCommand;
runCommandNoCCLocal = runCommandLocal;
- runwayml = throw "runwayml is now a webapp"; # added 2021-04-17
- rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # added 2021-10-19
- rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
- rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
- subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31
- thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
- thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
- togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained";
- urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
- urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02
- urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02
- urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # added 2020-02-02
- urxvt_font_size = rxvt-unicode-plugins.font-size; # added 2020-02-02
- urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # added 2020-02-02
- urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # added 2020-02-02
- urxvt_bidi = rxvt-unicode-plugins.bidi; # added 2020-02-02
- s2n = s2n-tls; # added 2021-03-03
- s6Dns = s6-dns; # added 2018-07-23
- s6Networking = s6-networking; # added 2018-07-23
- s6LinuxUtils = s6-linux-utils; # added 2018-07-23
- s6PortableUtils = s6-portable-utils; # added 2018-07-23
- sagemath = sage; # added 2018-10-27
- sam = deadpixi-sam; # added 2018-04-25
- samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
- saneBackends = sane-backends; # added 2016-01-02
- saneBackendsGit = sane-backends; # added 2016-01-02
- sane-backends-git = sane-backends; # added 2021-02-19
- saneFrontends = sane-frontends; # added 2016-01-02
- scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01
- scim = sc-im; # added 2016-01-22
- scollector = bosun; # added 2018-04-25
- scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # added 2021-10-07
- sdlmame = mame; # added 2019-10-30
- seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21
+ runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17
+ rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19
+ rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02
+ rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02
+
+ # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
+ # due to it being inside the linuxPackagesFor function.
+ rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14
+
+ ### S ###
+
+ s2n = s2n-tls; # Added 2021-03-03
+ s6Dns = s6-dns; # Added 2018-07-23
+ s6LinuxUtils = s6-linux-utils; # Added 2018-07-23
+ s6Networking = s6-networking; # Added 2018-07-23
+ s6PortableUtils = s6-portable-utils; # Added 2018-07-23
+ sagemath = sage; # Added 2018-10-27
+ sam = deadpixi-sam; # Added 2018-04-25
+ samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # Added 2016-01-25
+ sane-backends-git = sane-backends; # Added 2021-02-19
+ saneBackends = sane-backends; # Added 2016-01-02
+ saneBackendsGit = sane-backends; # Added 2016-01-02
+ saneFrontends = sane-frontends; # Added 2016-01-02
+ scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01
+ scim = sc-im; # Added 2016-01-22
+ scollector = bosun; # Added 2018-04-25
+ scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
+ sdlmame = mame; # Added 2019-10-30
+ seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
- sepolgen = throw "sepolgen was merged into selinux-python"; # added 2021-11-11
- shared_mime_info = shared-mime-info; # added 2018-02-25
- shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # added 2021-12-15
- sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
- sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # added 2022-01-01
- sigurlx = throw "sigurlx has been removed (upstream is gone)"; # added 2022-01-24
- skrooge2 = skrooge; # added 2017-02-18
+ sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11
+ shared_mime_info = shared-mime-info; # Added 2018-02-25
+ shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15
+ sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01
+ sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained."; # Added 2022-01-01
+ sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24
+ skrooge2 = skrooge; # Added 2017-02-18
sky = throw "sky has been removed from nixpkgs (2020-09-16)";
- skype = skypeforlinux; # added 2017-07-27
- skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31
- skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14
- slack-dark = slack; # added 2020-03-27
- slic3r-prusa3d = prusa-slicer; # added 2019-05-21
+ skype = skypeforlinux; # Added 2017-07-27
+ skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2021-07-14
+ skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # Added 2020-10-31
+ slack-dark = slack; # Added 2020-03-27
+ slic3r-prusa3d = prusa-slicer; # Added 2019-05-21
+ slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11
+ slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11
+ slurm-full = slurm; # Added 2018-05-1
slurm-llnl = slurm; # renamed July 2017
slurm-llnl-full = slurm-full; # renamed July 2017
- slurm-full = slurm; # added 2018-05-1
- smbclient = samba; # added 2018-04-25
- smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04
- slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
- slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
- solr_8 = solr; # added 2021-01-30
- spectral = neochat; # added 2020-12-27
- sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
+ smbclient = samba; # Added 2018-04-25
+ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # Added 2020-11-04
+ solr_8 = solr; # Added 2021-01-30
- # added 2020-02-10
+ # Added 2020-02-10
sourceHanSansPackages = {
japanese = source-han-sans;
korean = source-han-sans;
@@ -996,368 +1102,286 @@ mapAliases ({
source-han-serif-korean = source-han-serif;
source-han-serif-simplified-chinese = source-han-serif;
source-han-serif-traditional-chinese = source-han-serif;
- source-sans-pro = source-sans; # added 2021-10-20
- source-serif-pro = source-serif; # added 2021-10-20
+ source-sans-pro = source-sans; # Added 2021-10-20
+ source-serif-pro = source-serif; # Added 2021-10-20
- net_snmp = net-snmp; # added 2019-12-21
- oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09
spaceOrbit = space-orbit; # added 2016-05-23
+ spectral = neochat; # Added 2020-12-27
speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25
spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03
- spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_91 instead."; # added 2021-03-21
- spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_91 instead."; # added 2019-10-16
- spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_91 instead."; # added 2021-03-21
+ spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21
+ spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # Added 2019-10-16
+ spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # Added 2021-03-21
spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead."; # added 2022-01-04
+ # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
+ spidermonkey = spidermonkey_78; # Added 2020-10-09
spring-boot = spring-boot-cli; # added 2020-04-24
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
- sqliteInteractive = sqlite-interactive; # added 2014-12-06
+ sqliteInteractive = sqlite-interactive; # Added 2014-12-06
squid4 = squid; # added 2019-08-22
sshfsFuse = sshfs-fuse; # added 2016-09
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
- stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09
- surf-webkit2 = surf; # added 2017-04-02
- svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17
- swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14
- swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
- swtpm-tpm2 = swtpm; # added 2021-02-26
- syncthing-cli = syncthing; # added 2021-04-06
- synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # added 2021-11-26
- system_config_printer = system-config-printer; # added 2016-01-03
- systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12
- systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12
- systool = sysfsutils; # added 2018-04-25
- tahoelafs = tahoe-lafs; # added 2018-03-26
- tangogps = foxtrotgps; # added 2020-01-26
+ stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09
+ subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31
+ sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
+ surf-webkit2 = surf; # Added 2017-04-02
+ svgcleaner = throw "svgcleaner has been removed."; # Added 2021-11-17
+ swec = throw "swec has been removed; broken and abandoned upstream."; # Added 2021-10-14
+ swfdec = throw "swfdec has been removed as broken and unmaintained."; # Added 2020-08-23
+ swtpm-tpm2 = swtpm; # Added 2021-02-26
+ syncthing-cli = syncthing; # Added 2021-04-06
+ synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26
+ system_config_printer = system-config-printer; # Added 2016-01-03
+ systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12
+ systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12
+ systool = sysfsutils; # Added 2018-04-25
+
+ ### T ###
+
+ tahoelafs = tahoe-lafs; # Added 2018-03-26
+ tangogps = foxtrotgps; # Added 2020-01-26
tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead.";
- telepathy_farstream = telepathy-farstream; # added 2018-02-25
- telepathy_gabble = telepathy-gabble; # added 2018-02-25
- telepathy_glib = telepathy-glib; # added 2018-02-25
- telepathy_haze = telepathy-haze; # added 2018-02-25
- telepathy_idle = telepathy-idle; # added 2018-02-25
- telepathy_logger = telepathy-logger; # added 2018-02-25
- telepathy_mission_control = telepathy-mission-control; # added 2018-02-25
- telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02
- telepathy_qt = telepathy-qt; # added 2018-02-25
- telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19
- telepathy_salut = telepathy-salut; # added 2018-02-25
- telnet = inetutils; # added 2018-05-15
- terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # added 2021-08-21
+ telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # Added 2020-07-02
+ telepathy_farstream = telepathy-farstream; # Added 2018-02-25
+ telepathy_gabble = telepathy-gabble; # Added 2018-02-25
+ telepathy_glib = telepathy-glib; # Added 2018-02-25
+ telepathy_haze = telepathy-haze; # Added 2018-02-25
+ telepathy_idle = telepathy-idle; # Added 2018-02-25
+ telepathy_logger = telepathy-logger; # Added 2018-02-25
+ telepathy_mission_control = telepathy-mission-control; # Added 2018-02-25
+ telepathy_qt = telepathy-qt; # Added 2018-02-25
+ telepathy_qt5 = libsForQt5.telepathy; # Added 2015-12-19
+ telepathy_salut = telepathy-salut; # Added 2018-02-25
+ telnet = inetutils; # Added 2018-05-15
+ terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21
+ terraform-provider-ibm = terraform-providers.ibm; # Added 2018-09-28
+ terraform-provider-libvirt = terraform-providers.libvirt; # Added 2018-09-28
+ terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16
terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01";
- terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # added 2021-06-15
- terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # added 2021-12-08
- terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28
- terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
- terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16
- tesseract_4 = tesseract4; # added 2018-12-19
- tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
- tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03
- tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
- tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
- tftp_hpa = tftp-hpa; # added 2015-04-03
- timescale-prometheus = promscale; # added 2020-09-29
- timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05
- tomboy = throw "tomboy is not actively developed anymore and was removed."; # added 2022-01-27
- tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16
- tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16
- tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11
- tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # added 2022-01-01
- torbrowser = tor-browser-bundle-bin; # added 2017-04-05
- torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28
- trang = jing-trang; # added 2018-04-25
- transmission_gtk = transmission-gtk; # added 2018-01-06
- transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
- transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14
+ terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08
+ terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15
+ tesseract_4 = tesseract4; # Added 2018-12-19
+ tex-gyre-bonum-math = tex-gyre-math.bonum; # Added 2018-04-03
+ tex-gyre-pagella-math = tex-gyre-math.pagella; # Added 2018-04-03
+ tex-gyre-schola-math = tex-gyre-math.schola; # Added 2018-04-03
+ tex-gyre-termes-math = tex-gyre-math.termes; # Added 2018-04-03
+ tftp_hpa = tftp-hpa; # Added 2015-04-03
+ thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25.";
+ thunderbird-bin-68 = thunderbird-68;
+ timescale-prometheus = promscale; # Added 2020-09-29
+ timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05
+ togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30
+ tomboy = throw "tomboy is not actively developed anymore and was removed."; # Added 2022-01-27
+ tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16
+ tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # Added 2021-06-16
+ tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # Added 2020-03-11
+ tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # Added 2022-01-01
+ torbrowser = tor-browser-bundle-bin; # Added 2017-04-05
+ torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
+ trang = jing-trang; # Added 2018-04-25
+ transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14
+ transmission_gtk = transmission-gtk; # Added 2018-01-06
+ transmission_remote_gtk = transmission-remote-gtk; # Added 2018-01-06
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned.";
- trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29
- truecrypt = veracrypt; # added 2018-10-24
- tshark = wireshark-cli; # added 2018-04-25
- tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07
- turbo-geth = throw "turbo-geth has been renamed to erigon"; # added 2021-08-08
- typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # added 2021-09-11
- uberwriter = apostrophe; # added 2020-04-23
- ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
- ucsFonts = ucs-fonts; # added 2016-07-15
- ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # 2020-01-11
- ultrastardx-beta = ultrastardx; # added 2017-08-12
- unicorn-emu = unicorn; # added 2020-10-29
- unifiStable = unifi6; # added 2020-12-28
- untrunc = untrunc-anthwlock; # added 2021-02-01
- usb_modeswitch = usb-modeswitch; # added 2016-05-10
- usbguard-nox = usbguard; # added 2019-09-04
- utillinux = util-linux; # added 2020-11-24
- uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
- v4l_utils = v4l-utils; # added 2019-08-07
- v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
- vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";
- vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
- varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
- varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
- varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15
- venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05
- vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
- vimbWrapper = vimb; # added 2015-01
- vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05
- vimprobable2-unwrapped = vimprobable2; # added 2019-12-05
- virtviewer = virt-viewer; # added 2015-12-24
- virtmanager = virt-manager; # added 2019-10-29
- virtmanager-qt = virt-manager-qt; # added 2019-10-29
- virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21
- vorbisTools = vorbis-tools; # added 2016-01-26
- vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29
- way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13
- webkit = webkitgtk; # added 2019-03-05
- webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
- webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
- weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
- wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11
- wineStaging = wine-staging; # added 2018-01-08
- wineWayland = wine-wayland;
- winusb = woeusb; # added 2017-12-22
- winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
- wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18
- wireguard = wireguard-tools; # added 2018-05-19
- wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # 2022-01-31
- morituri = whipper; # added 2018-09-13
- xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19
- xp-pen-g430 = pentablet-driver; # added 2020-05-03
- xdg_utils = xdg-utils; # added 2021-02-01
- xfceUnstable = xfce4-14; # added 2019-09-17
- xfce4-14 = xfce;
- xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14
- x11 = xlibsWrapper; # added 2015-09
- xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24
- xbmc = kodi; # added 2018-04-25
- xbmcPlain = kodiPlain; # added 2018-04-25
- xbmcPlugins = kodiPackages; # added 2018-04-25
- kodiPlugins = kodiPackages; # added 2021-03-09;
- xineLib = xine-lib; # added 2021-04-27
- xineUI = xine-ui; # added 2021-04-27
- xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
- xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
- pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";
- pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only";
- xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
- xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained"
- + "and is broken. Working alternatives are libinput and synaptics.");
- xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20
- xlibs = xorg; # added 2015-09
- xpraGtk3 = xpra; # added 2018-09-13
- xv = xxv; # added 2020-02-22
- xvfb_run = xvfb-run; # added 2021-05-07
- yacc = bison; # moved from top-level 2021-03-14
- yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # added 2022-01-15
- youtubeDL = youtube-dl; # added 2014-10-26
- ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
- yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08
- yuzu = yuzu-mainline; # added 2021-01-25
- zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # added 2021-04-07
- zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28
- zdfmediathk = mediathekview; # added 2019-01-19
+ trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # Added 2020-04-29
+ truecrypt = veracrypt; # Added 2018-10-24
+ tshark = wireshark-cli; # Added 2018-04-25
+ tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+ turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08
+ typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed."; # Added 2021-09-11
- gnome_user_docs = gnome-user-docs; # added 2019-11-20
- # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
- spidermonkey = spidermonkey_91; # added 2020-10-09
- libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20
- libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20
- libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20
- libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20
+ ### U ###
+
+ uberwriter = apostrophe; # Added 2020-04-23
+ ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21
+ ucsFonts = ucs-fonts; # Added 2016-07-15
+ ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now."; # Added 2020-01-11
+ ultrastardx-beta = ultrastardx; # Added 2017-08-12
+ unicorn-emu = unicorn; # Added 2020-10-29
+ unifiStable = unifi6; # Added 2020-12-28
+ untrunc = untrunc-anthwlock; # Added 2021-02-01
+ urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02
+ urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02
+ urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02
+ urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02
+ urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02
+ urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02
+ urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02
+ urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02
+ usb_modeswitch = usb-modeswitch; # Added 2016-05-10
+ usbguard-nox = usbguard; # Added 2019-09-04
+ utillinux = util-linux; # Added 2020-11-24
+ uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
+
+ ### V ###
+
+ v4l_utils = v4l-utils; # Added 2019-08-07
+ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
+ vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
+ vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";
+ varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26
+ varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-07-26
+ varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # Added 2021-09-15
+ vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
+ venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05
+ vimbWrapper = vimb; # Added 2015-01
+ vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # Added 2019-12-05
+ vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05
+ virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21
+ virtmanager = virt-manager; # Added 2019-10-29
+ virtmanager-qt = virt-manager-qt; # Added 2019-10-29
+ virtviewer = virt-viewer; # Added 2015-12-24
+ vorbisTools = vorbis-tools; # Added 2016-01-26
+ vtun = throw "vtune has been removed as it's unmaintained upstream."; # Added 2021-10-29
+
+ ### W ###
+
+ way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13
+ webkit = webkitgtk; # Added 2019-03-05
+ webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05
+ webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05
+ weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06
+ wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11
+ wineFull = winePackages.full; # Added 2017-05-27
+ wineMinimal = winePackages.minimal; # Added 2017-05-27
+ wineStable = winePackages.stable; # Added 2017-05-27
+ wineStaging = wine-staging; # Added 2018-01-08
+ wineUnstable = winePackages.unstable; # Added 2017-05-27
+ wineWayland = wine-wayland;
+ winswitch = throw "winswitch has been removed from nixpkgs."; # Added 2019-12-10
+ winusb = woeusb; # Added 2017-12-22
+ wireguard = wireguard-tools; # Added 2018-05-19
+ wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # Added 2019-11-18
+ wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # Added 2022-01-31
+
+ ### X ###
+
+ x11 = xlibsWrapper; # Added 2015-09
+ xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24
+ xbmc = kodi; # Added 2018-04-25
+ xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19
+ xbmcPlain = kodiPlain; # Added 2018-04-25
+ xbmcPlugins = kodiPackages; # Added 2018-04-25
+ xdg_utils = xdg-utils; # Added 2021-02-01
+ xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14
+ xfce4-14 = xfce;
+ xfceUnstable = xfce4-14; # Added 2019-09-17
+ xineLib = xine-lib; # Added 2021-04-27
+ xineUI = xine-ui; # Added 2021-04-27
+ xmonad_log_applet_gnome3 = xmonad_log_applet; # Added 2018-05-01
+ xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
+ xp-pen-g430 = pentablet-driver; # Added 2020-05-03
+ xf86_video_nouveau = xorg.xf86videonouveau; # Added 2015-09
+ xf86_input_mtrack = throw ''
+ xf86_input_mtrack has been removed from nixpkgs as it is broken and
+ unmaintained. Working alternatives are libinput and synaptics.
+ '';
+ xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # Added 2020-01-20
+ xlibs = xorg; # Added 2015-09
+ xpraGtk3 = xpra; # Added 2018-09-13
+ xv = xxv; # Added 2020-02-22
+ xvfb_run = xvfb-run; # Added 2021-05-07
+
+ ### Y ###
+
+ yacc = bison; # moved from top-level 2021-03-14
+ yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15
+ youtubeDL = youtube-dl; # Added 2014-10-26
+ ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
+ yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # Added 2021-03-08
+ yuzu = yuzu-mainline; # Added 2021-01-25
+
+ ### Z ###
+
+ zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07
+ zdfmediathk = mediathekview; # Added 2019-01-19
+ zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # Added 2021-03-28
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off
- # added 2017-05-27
- wineMinimal = winePackages.minimal;
- wineFull = winePackages.full;
- wineStable = winePackages.stable;
- wineUnstable = winePackages.unstable;
-
- # added 2018-03-26
- libva-full = libva;
- libva1-full = libva1;
-
- # forceSystem should not be used directly in Nixpkgs.
- # added 2018-07-16
- forceSystem = system: _:
- (import self.path { localSystem = { inherit system; }; });
- callPackage_i686 = pkgsi686Linux.callPackage;
-
- inherit (ocaml-ng) # added 2016-09-14
+ inherit (ocaml-ng) # Added 2016-09-14
ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
- ocamlPackages_4_03
- ocamlPackages_latest;
+ ocamlPackages_4_03 ocamlPackages_latest;
- mumble_git = pkgs.mumble; # added 2019-08-01
- murmur_git = pkgs.murmur; # added 2019-08-01
- zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17
+ zabbix44 = throw ''
+ Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at
+ https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500
+ ''; # Added 2020-08-17
- # added 2019-09-06
+ # Added 2019-09-06
zeroc_ice = pkgs.zeroc-ice;
- # added 2020-06-22
+ # Added 2020-06-22
zeromq3 = throw "zeromq3 has been deprecated by zeromq4.";
jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained";
-} // (with ocaml-ng; { # added 2016-09-14
+
+} // (with ocaml-ng; { # Added 2016-09-14
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
ocaml_4_02 = ocamlPackages_4_02.ocaml;
ocaml_4_03 = ocamlPackages_4_03.ocaml;
}) // {
- gnatsd = nats-server; # added 2019-10-28
- tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10
- tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10
- dina-font-pcf = dina-font; # added 2020-02-09
-
- /* Cleanup before 20.09 */
- oraclejdk8psu = throw ''
- oraclejdk8psu: The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed!
- '';
- oraclejre8psu = oraclejdk8psu;
- oraclejdk8psu_distro = oraclejdk8psu;
-
- dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02
- sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04
- gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7.";
- todolist = throw "todolist is now ultralist."; # added 2020-12-27
-
- /* Cleanup before 21.05 */
- riot-desktop = throw "riot-desktop is now element-desktop!";
- riot-web = throw "riot-web is now element-web";
-
- ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
-
- /* Added 2021-01-02 */
- ttyrec = ovh-ttyrec;
-
- tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # added 2012-06-12
-
- zplugin = zinit; # Added 2021-01-30
-
- posix_man_pages = man-pages-posix; # Added 2021-04-15
-
- /* Cleanup before 21.11, Added 2021-05-07 */
avian = throw ''
- The package doesn't compile anymore on NixOS and both development
- & maintenance is abandoned by upstream.
- '';
+ The package doesn't compile anymore on NixOS and both development &
+ maintenance is abandoned by upstream.
+ ''; # Cleanup before 21.11, Added 2021-05-07
+ ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
+ dina-font-pcf = dina-font; # Added 2020-02-09
+ dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # Added 2020-02-02
+ gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7.";
+ gnatsd = nats-server; # Added 2019-10-28
- # Added 2021-06-01
obs-gstreamer = throw ''
obs-gstreamer has been converted into a plugin for use with wrapOBS.
Its new location is obs-studio-plugins.obs-gstreamer.
- '';
+ ''; # Added 2021-06-01
- # Added 2021-06-01
obs-move-transition = throw ''
obs-move-transition has been converted into a plugin for use with wrapOBS.
Its new location is obs-studio-plugins.obs-move-transition.
- '';
+ ''; # Added 2021-06-01
- # Added 2021-06-01
obs-multi-rtmp = throw ''
obs-multi-rtmp has been converted into a plugin for use with wrapOBS.
Its new location is obs-studio-plugins.obs-multi-rtmp.
- '';
+ ''; # Added 2021-06-01
- # Added 2021-06-01
obs-ndi = throw ''
obs-ndi has been converted into a plugin for use with wrapOBS.
Its new location is obs-studio-plugins.obs-ndi.
- '';
+ ''; # Added 2021-06-01
- obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01
+ obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01
- # Added 2021-06-01
obs-wlrobs = throw ''
wlrobs has been converted into a plugin for use with wrapOBS.
Its new location is obs-studio-plugins.wlrobs.
- '';
+ ''; # Added 2021-06-01
- multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
+ oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream."; # Cleanup before 20.09
+ oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09
+ oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09
+ posix_man_pages = man-pages-posix; # Added 2021-04-15
+ riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05
+ riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05
+ sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04
+ todolist = throw "todolist is now ultralist."; # Added 2020-12-27
+ tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10
+ tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead."; # Added 2020-01-10
+ tt-rss-plugin-tumblr-gdpr = throw "tt-rss-plugin-tumblr-gdpr was removed because tumblr does not require gdpr acceptance to fetch rss feeds anymore"; # Added 2012-06-12
+ ttyrec = ovh-ttyrec; # Added 2021-01-02
+ zplugin = zinit; # Added 2021-01-30
- /* If these are in the scope of all-packages.nix, they cause collisions
- between mixed versions of qt. See:
- https://github.com/NixOS/nixpkgs/pull/101369 */
-
- inherit (plasma5Packages) breeze-icons oxygen-icons5;
- inherit (plasma5Packages)
- akonadi akregator ark
- bomber bovo
- dolphin dragon
- elisa
- ffmpegthumbs filelight
- granatier gwenview
- k3b
- kaddressbook kalzium kapptemplate kapman kate katomic
- kblackbox kblocks kbounce
- kcachegrind kcalc kcharselect kcolorchooser
- kdenlive kdf kdialog kdiamond
- keditbookmarks
- kfind kfloppy
- kget kgpg
- khelpcenter
- kig kigo killbots kitinerary
- kleopatra klettres klines
- kmag kmail kmines kmix kmplot
- knavalbattle knetwalk knights
- kollision kolourpaint kompare konsole kontact korganizer
- kpkpass
- krdc kreversi krfb
- kshisen ksquares ksystemlog
- kteatime ktimer ktouch kturtle
- kwalletmanager kwave
- marble minuet
- okular
- picmi
- spectacle
- yakuake
- ;
- inherit (plasma5Packages)
- bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth
- discover
- kactivitymanagerd
- kde-cli-tools kde-gtk-config kdeplasma-addons
- kgamma5
- kinfocenter
- kmenuedit
- kscreen kscreenlocker ksshaskpass
- kwallet-pam kwayland-integration kwin kwrited
- milou
- oxygen
- plasma-browser-integration
- plasma-desktop
- plasma-integration
- plasma-nm
- plasma-pa
- plasma-systemmonitor
- plasma-thunderbolt
- plasma-vault
- plasma-workspace plasma-workspace-wallpapers
- polkit-kde-agent powerdevil
- qqc2-breeze-style
- sddm-kcm systemsettings
- xdg-desktop-portal-kde
- plasma-phone-components
- plasma-nano
- ;
- inherit (plasma5Packages.thirdParty)
- plasma-applet-caffeine-plus
- plasma-applet-virtual-desktop-bar
- kwin-dynamic-workspaces
- kwin-tiling
- krohnkite
- krunner-symbols
- ;
- inherit (libsForQt5)
- sddm
- ;
+ inherit (stdenv.hostPlatform) system; # Added 2021-10-22
# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git {
@@ -1366,6 +1390,41 @@ mapAliases ({
targetLlvmLibraries = targetPackages.llvmPackages_git.libraries;
});
- inherit (stdenv.hostPlatform) system; # added 2021-10-22
+ /* If these are in the scope of all-packages.nix, they cause collisions
+ between mixed versions of qt. See:
+ https://github.com/NixOS/nixpkgs/pull/101369 */
+
+ inherit (plasma5Packages)
+ akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
+ breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa
+ ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
+ kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
+ kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
+ kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy
+ kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
+ kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
+ knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
+ korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares
+ ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam
+ kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet
+ okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop
+ plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components
+ plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace
+ plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style
+ sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake
+ ;
+
+ inherit (plasma5Packages.thirdParty)
+ krohnkite
+ krunner-symbols
+ kwin-dynamic-workspaces
+ kwin-tiling
+ plasma-applet-caffeine-plus
+ plasma-applet-virtual-desktop-bar
+ ;
+
+ inherit (libsForQt5)
+ sddm
+ ;
})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b7456ee0995..3fc2bcebfd3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -699,12 +699,20 @@ with pkgs;
makeDesktopItem = callPackage ../build-support/make-desktopitem { };
+ makeDarwinBundle = callPackage ../build-support/make-darwin-bundle { };
+
makeAutostartItem = callPackage ../build-support/make-startupitem { };
makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out
- makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; }; }
- ../build-support/setup-hooks/make-wrapper.sh;
+ makeWrapper = makeSetupHook
+ { deps = [ dieHook ];
+ substitutions = {
+ shell = targetPackages.runtimeShell;
+ passthru.tests = tests.makeWrapper;
+ };
+ }
+ ../build-support/setup-hooks/make-wrapper.sh;
makeBinaryWrapper = let
f = { cc, sanitizers }: let
@@ -801,6 +809,11 @@ with pkgs;
substitutions = { inherit (binutils) targetPrefix; };
} ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
+ writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { };
+
+ desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle imagemagick ]; }
+ ../build-support/setup-hooks/desktop-to-darwin-bundle.sh;
+
keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
@@ -1013,6 +1026,8 @@ with pkgs;
gfshare = callPackage ../tools/security/gfshare { };
+ glooctl = callPackage ../applications/networking/cluster/glooctl { };
+
gobgp = callPackage ../tools/networking/gobgp { };
gofu = callPackage ../applications/misc/gofu { };
@@ -1427,9 +1442,7 @@ with pkgs;
awslogs = callPackage ../tools/admin/awslogs { };
- aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator {
- buildGoModule = buildGo116Module;
- };
+ aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { };
aws-env = callPackage ../tools/admin/aws-env { };
@@ -1901,6 +1914,8 @@ with pkgs;
lastpass-cli = callPackage ../tools/security/lastpass-cli { };
+ leetcode-cli = callPackage ../applications/misc/leetcode-cli { };
+
lesspass-cli = callPackage ../tools/security/lesspass-cli { };
lsix = callPackage ../tools/graphics/lsix { };
@@ -3879,14 +3894,7 @@ with pkgs;
bdsync = callPackage ../tools/backup/bdsync { };
- beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter {
- # developed for a compiler with C++20 support
- stdenv =
- if stdenv.isDarwin then
- overrideCC stdenv clang_10
- else
- stdenv;
- };
+ beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { };
beanstalkd = callPackage ../servers/beanstalkd { };
@@ -4213,6 +4221,8 @@ with pkgs;
unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
+ unparam = callPackage ../tools/misc/unparam { };
+
inherit (nodePackages) uppy-companion;
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
@@ -5589,6 +5599,8 @@ with pkgs;
gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
+ garage = callPackage ../tools/filesystems/garage { };
+
garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
garmintools = callPackage ../development/libraries/garmintools {};
@@ -5924,10 +5936,6 @@ with pkgs;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
};
- gnash = callPackage ../misc/gnash {
- autoreconfHook = buildPackages.autoreconfHook269;
- };
-
gnirehtet = callPackage ../tools/networking/gnirehtet { };
gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };
@@ -6772,6 +6780,8 @@ with pkgs;
jl = haskellPackages.callPackage ../development/tools/jl { };
+ jless = callPackage ../development/tools/jless { };
+
jmespath = callPackage ../development/tools/jmespath { };
jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
@@ -7621,6 +7631,8 @@ with pkgs;
lzip = callPackage ../tools/compression/lzip { };
+ lziprecover = callPackage ../tools/compression/lziprecover { };
+
luxcorerender = callPackage ../tools/graphics/luxcorerender {
openimagedenoise = openimagedenoise_1_2_x;
};
@@ -8742,6 +8754,8 @@ with pkgs;
pcapc = callPackage ../tools/networking/pcapc { };
+ pdm = callPackage ../tools/package-management/pdm { };
+
pdnsd = callPackage ../tools/networking/pdnsd { };
peco = callPackage ../tools/text/peco { };
@@ -8796,6 +8810,8 @@ with pkgs;
xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook;
};
+ pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
+
pingtcp = callPackage ../tools/networking/pingtcp { };
pinnwand = callPackage ../servers/pinnwand { };
@@ -12702,10 +12718,7 @@ with pkgs;
/**/ if platform.isDarwin then 11
else if platform.isFreeBSD then 7
else if platform.isAndroid then 12
- else if platform.isLinux then
- /**/ if platform.isRiscV then 11
- else if platform.isMusl then 11
- else 7
+ else if platform.isLinux then 11
else if platform.isWasm then 8
else latest_version;
# We take the "max of the mins". Why? Since those are lower bounds of the
@@ -12982,18 +12995,18 @@ with pkgs;
inherit (darwin) apple_sdk;
};
- rust_1_57 = callPackage ../development/compilers/rust/1_57.nix {
+ rust_1_58 = callPackage ../development/compilers/rust/1_58.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_13 = llvmPackages_13.libllvm;
};
- rust = rust_1_57;
+ rust = rust_1_58;
mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
- rustPackages_1_57 = rust_1_57.packages.stable;
- rustPackages = rustPackages_1_57;
+ rustPackages_1_58 = rust_1_58.packages.stable;
+ rustPackages = rustPackages_1_58;
inherit (rustPackages) cargo clippy rustc rustPlatform;
@@ -13660,6 +13673,8 @@ with pkgs;
mujs = callPackage ../development/interpreters/mujs { };
+ nextflow = callPackage ../development/interpreters/nextflow { };
+
ngn-k = callPackage ../development/interpreters/ngn-k { };
obb = callPackage ../development/interpreters/clojure/obb.nix { };
@@ -14286,13 +14301,7 @@ with pkgs;
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
- bear = callPackage ../development/tools/build-managers/bear {
- # error: no viable constructor or deduction guide for deduction of template arguments of 'map'
- stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then
- llvmPackages_11.stdenv
- else
- stdenv;
- };
+ bear = callPackage ../development/tools/build-managers/bear { };
bingrep = callPackage ../development/tools/analysis/bingrep { };
@@ -15536,9 +15545,7 @@ with pkgs;
spooles = callPackage ../development/libraries/science/math/spooles {};
- spruce = callPackage ../development/tools/misc/spruce {
- buildGoModule = buildGo116Module;
- };
+ spruce = callPackage ../development/tools/misc/spruce {};
sqlcheck = callPackage ../development/tools/database/sqlcheck { };
@@ -15587,9 +15594,7 @@ with pkgs;
c2ffi = callPackage ../development/tools/misc/c2ffi { };
- c3c = callPackage ../development/compilers/c3c {
- llvmPackages = llvmPackages_11;
- };
+ c3c = callPackage ../development/compilers/c3c { };
swfmill = callPackage ../tools/video/swfmill { };
@@ -15812,7 +15817,9 @@ with pkgs;
aalib = callPackage ../development/libraries/aalib { };
- abseil-cpp = callPackage ../development/libraries/abseil-cpp { };
+ abseil-cpp_202111 = callPackage ../development/libraries/abseil-cpp/202111.nix { };
+ abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { };
+ abseil-cpp = abseil-cpp_202103;
accountsservice = callPackage ../development/libraries/accountsservice { };
@@ -16455,6 +16462,8 @@ with pkgs;
ffmpeg_3 = ffmpeg_3_4;
# Please make sure this is updated to the latest version on the next major
# update to ffmpeg
+ # Packages which use ffmpeg as a library, should pin to the relevant major
+ # version number which the upstream support.
ffmpeg = ffmpeg_4;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
@@ -16662,8 +16671,6 @@ with pkgs;
ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};
- giblib = callPackage ../development/libraries/giblib { };
-
gifticlib = callPackage ../development/libraries/science/biology/gifticlib { };
gio-sharp = callPackage ../development/libraries/gio-sharp { };
@@ -17348,8 +17355,7 @@ with pkgs;
iso-flags = callPackage ../data/icons/iso-flags { };
ispc = callPackage ../development/compilers/ispc {
- stdenv = llvmPackages_11.stdenv;
- llvmPackages = llvmPackages_11;
+ inherit (llvmPackages) stdenv;
};
isso = callPackage ../servers/isso {
@@ -19229,10 +19235,12 @@ with pkgs;
opencv2 = callPackage ../development/libraries/opencv {
inherit (darwin.apple_sdk.frameworks) Cocoa QTKit;
+ ffmpeg = ffmpeg_4;
};
opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
+ ffmpeg = ffmpeg_4;
};
opencv3WithoutCuda = opencv3.override {
@@ -19242,6 +19250,7 @@ with pkgs;
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
pythonPackages = python3Packages;
+ ffmpeg = ffmpeg_4;
};
opencv = opencv4;
@@ -20400,7 +20409,10 @@ with pkgs;
websocketpp = callPackage ../development/libraries/websocket++ { };
- webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { };
+ webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
+ webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
+ # bump when majoring of packages have updated
+ webrtc-audio-processing = webrtc-audio-processing_0_3;
wildmidi = callPackage ../development/libraries/wildmidi { };
@@ -20424,21 +20436,14 @@ with pkgs;
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
- wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
- inherit (darwin.stubs) setfile;
- inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
- };
+ wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { };
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = true;
- inherit (darwin.stubs) setfile;
- inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = false;
- inherit (darwin.stubs) setfile;
- inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
@@ -20453,10 +20458,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
- wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
- inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
- inherit (darwin.stubs) setfile rez derez;
- };
+ wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { };
wxSVG = callPackage ../development/libraries/wxSVG {
wxGTK = wxGTK30-gtk3;
@@ -22807,9 +22809,7 @@ with pkgs;
octomap = callPackage ../development/libraries/octomap { };
- odin = callPackage ../development/compilers/odin {
- llvmPackages = llvmPackages_11;
- };
+ odin = callPackage ../development/compilers/odin { };
odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
@@ -23982,8 +23982,6 @@ with pkgs;
sweet = callPackage ../data/themes/sweet { };
- mime-types = callPackage ../data/misc/mime-types { };
-
shared-mime-info = callPackage ../data/misc/shared-mime-info { };
shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
@@ -28389,6 +28387,8 @@ with pkgs;
renoise = callPackage ../applications/audio/renoise {};
+ redux = callPackage ../applications/audio/redux { };
+
roomeqwizard = callPackage ../applications/audio/roomeqwizard { };
radiotray-ng = callPackage ../applications/audio/radiotray-ng {
@@ -30340,7 +30340,7 @@ with pkgs;
boost = boost175;
};
- zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
+ zcash = callPackage ../applications/blockchains/zcash { };
lightwalletd = callPackage ../applications/blockchains/lightwalletd { };
@@ -32856,8 +32856,6 @@ with pkgs;
dell-530cdn = callPackage ../misc/drivers/dell-530cdn {};
- demjson = with python3Packages; toPythonApplication demjson;
-
dosbox = callPackage ../misc/emulators/dosbox { };
dosbox-staging = callPackage ../misc/emulators/dosbox-staging { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f688e9a36bde..85072959df37 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -33,14 +33,17 @@ in
### Deprecated aliases - for backward compatibility
mapAliases ({
+ anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
asyncio-nats-client = nats-py; # added 2022-02-08
blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
bt_proximity = bt-proximity; # added 2021-07-02
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27
+ carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
class-registry = phx-class-registry; # added 2021-10-05
ConfigArgParse = configargparse; # added 2021-03-18
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
dateutil = python-dateutil; # added 2021-07-03
+ demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04
diff_cover = diff-cover; # added 2021-07-02
@@ -63,6 +66,7 @@ mapAliases ({
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
HAP-python = hap-python; # added 2021-06-01
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
+ hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
IMAPClient = imapclient; # added 2021-10-28
jupyter_client = jupyter-client; # added 2021-10-15
Keras = keras; # added 2021-11-25
@@ -76,6 +80,7 @@ mapAliases ({
prompt_toolkit = prompt-toolkit; # added 2021-07-22
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
+ pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
pysmart-smartx = pysmart; # added 2021-10-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6ef2ecfb83e..d2a18db510d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -408,6 +408,8 @@ in {
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
+ aiosteamist = callPackage ../development/python-modules/aiosteamist { };
+
aiostream = callPackage ../development/python-modules/aiostream { };
aioswitcher = callPackage ../development/python-modules/aioswitcher { };
@@ -544,8 +546,6 @@ in {
anyio = callPackage ../development/python-modules/anyio { };
- anyjson = callPackage ../development/python-modules/anyjson { };
-
anytree = callPackage ../development/python-modules/anytree {
inherit (pkgs) graphviz;
};
@@ -614,6 +614,8 @@ in {
argon2_cffi = callPackage ../development/python-modules/argon2_cffi { };
+ argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { };
+
args = callPackage ../development/python-modules/args { };
aria2p = callPackage ../development/python-modules/aria2p { };
@@ -1453,8 +1455,6 @@ in {
carbon = callPackage ../development/python-modules/carbon { };
- carrot = callPackage ../development/python-modules/carrot { };
-
cart = callPackage ../development/python-modules/cart { };
cartopy = callPackage ../development/python-modules/cartopy { };
@@ -2106,8 +2106,6 @@ in {
deluge-client = callPackage ../development/python-modules/deluge-client { };
- demjson = callPackage ../development/python-modules/demjson { };
-
demjson3 = callPackage ../development/python-modules/demjson3 { };
dendropy = callPackage ../development/python-modules/dendropy { };
@@ -2176,6 +2174,8 @@ in {
discordpy = callPackage ../development/python-modules/discordpy { };
+ discovery30303 = callPackage ../development/python-modules/discovery30303 { };
+
diskcache = callPackage ../development/python-modules/diskcache { };
dissononce = callPackage ../development/python-modules/dissononce { };
@@ -2569,6 +2569,8 @@ in {
emoji = callPackage ../development/python-modules/emoji { };
+ empty-files = callPackage ../development/python-modules/empty-files { };
+
empy = callPackage ../development/python-modules/empy { };
emulated-roku = callPackage ../development/python-modules/emulated-roku { };
@@ -2861,6 +2863,8 @@ in {
flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { };
+ flake8-bugbear = callPackage ../development/python-modules/flake8-bugbear { };
+
flake8 = callPackage ../development/python-modules/flake8 { };
flake8-length = callPackage ../development/python-modules/flake8-length { };
@@ -3662,8 +3666,6 @@ in {
hdfs = callPackage ../development/python-modules/hdfs { };
- hdlparse = callPackage ../development/python-modules/hdlparse { };
-
hdmedians = callPackage ../development/python-modules/hdmedians { };
headerparser = callPackage ../development/python-modules/headerparser { };
@@ -4463,7 +4465,7 @@ in {
language-data = callPackage ../development/python-modules/language-data { };
- lark-parser = callPackage ../development/python-modules/lark-parser { };
+ lark = callPackage ../development/python-modules/lark { };
latexcodec = callPackage ../development/python-modules/latexcodec { };
@@ -5673,6 +5675,8 @@ in {
opensimplex = callPackage ../development/python-modules/opensimplex { };
+ openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { };
+
openstacksdk = callPackage ../development/python-modules/openstacksdk { };
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
@@ -6599,8 +6603,6 @@ in {
inherit (pkgs.buildPackages) meson;
};
- pycallgraph = callPackage ../development/python-modules/pycallgraph { };
-
py = callPackage ../development/python-modules/py { };
pycangjie = callPackage ../development/python-modules/pycangjie { };
@@ -7331,6 +7333,8 @@ in {
pypykatz = callPackage ../development/python-modules/pypykatz { };
+ pypytools = callPackage ../development/python-modules/pypytools { };
+
pyqrcode = callPackage ../development/python-modules/pyqrcode { };
pyqt-builder = callPackage ../development/python-modules/pyqt-builder { };
@@ -8060,7 +8064,8 @@ in {
python-oauth2 = callPackage ../development/python-modules/python-oauth2 { };
pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core {
- inherit (pkgs.xorg) libX11;
+ inherit (pkgs) fontconfig rapidjson;
+ inherit (pkgs.xorg) libX11 libXi libXmu libXext;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
});
@@ -8462,6 +8467,8 @@ in {
radish-bdd = callPackage ../development/python-modules/radish-bdd { };
+ railroad-diagrams = callPackage ../development/python-modules/railroad-diagrams { };
+
rainbowstream = callPackage ../development/python-modules/rainbowstream { };
ramlfications = callPackage ../development/python-modules/ramlfications { };
@@ -9281,6 +9288,8 @@ in {
sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { };
+ sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { };
+
sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { };
sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { };
@@ -9631,6 +9640,8 @@ in {
tbm-utils = callPackage ../development/python-modules/tbm-utils { };
+ teamcity-messages = callPackage ../development/python-modules/teamcity-messages { };
+
telegram = callPackage ../development/python-modules/telegram { };
telethon = callPackage ../development/python-modules/telethon {
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 22f72a33d2c9..b98357a2cb0e 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -26,6 +26,8 @@ with self; with super; {
contextlib2 = callPackage ../development/python2-modules/contextlib2 { };
+ coverage = callPackage ../development/python2-modules/coverage { };
+
cryptography = callPackage ../development/python2-modules/cryptography { };
cryptography_vectors = callPackage ../development/python2-modules/cryptography-vectors { };
@@ -110,6 +112,8 @@ with self; with super; {
pyjwt = callPackage ../development/python2-modules/pyjwt { };
+ pyparsing = callPackage ../development/python2-modules/pyparsing { };
+
pyroma = callPackage ../development/python2-modules/pyroma { };
pysqlite = callPackage ../development/python2-modules/pysqlite { };