diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index 035e3ffe8973..3ff3cf5645f8 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -682,7 +682,7 @@ class Machine:
with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
retry(tty_matches)
- def send_chars(self, chars: List[str]) -> None:
+ def send_chars(self, chars: str) -> None:
with self.nested("sending keys ‘{}‘".format(chars)):
for char in chars:
self.send_key(char)
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index a683c537f05b..e88daae1fbba 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -51,7 +51,7 @@ in
services.unifi.openFirewall = mkOption {
type = types.bool;
- default = true;
+ default = false;
description = ''
Whether or not to open the minimum required ports on the firewall.
@@ -85,10 +85,6 @@ in
config = mkIf cfg.enable {
- warnings = optional
- (options.services.unifi.openFirewall.highestPrio >= (mkOptionDefault null).priority)
- "The current services.unifi.openFirewall = true default is deprecated and will change to false in 22.11. Set it explicitly to silence this warning.";
-
users.users.unifi = {
isSystemUser = true;
group = "unifi";
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index b0f160c1dbf9..66fdc61d2835 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -219,14 +219,15 @@ let
cidr = "${route.address}/${toString route.prefixLength}";
via = optionalString (route.via != null) ''via "${route.via}"'';
options = concatStrings (mapAttrsToList (name: val: "${name} ${val} ") route.options);
+ type = toString route.type;
in
''
echo "${cidr}" >> $state
echo -n "adding route ${cidr}... "
- if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then
+ if out=$(ip route add ${type} "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then
echo "done"
elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
- echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out"
+ echo "'ip route add ${type} "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out"
exit 1
fi
''
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 110e84494a3d..80808e0c08fa 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -142,6 +142,9 @@ in
optionalAttrs (route.via != null) {
Gateway = route.via;
} //
+ optionalAttrs (route.type != null) {
+ Type = route.type;
+ } //
optionalAttrs (route.options ? onlink) {
GatewayOnLink = true;
} //
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index d56159f15960..07bccf98f407 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -90,6 +90,22 @@ let
'';
};
+ type = mkOption {
+ type = types.nullOr (types.enum [
+ "unicast" "local" "broadcast" "multicast"
+ ]);
+ default = null;
+ description = ''
+ Type of the route. See the Route types section
+ in the ip-route(8) manual page for the details.
+
+ Note that prohibit, blackhole,
+ unreachable, and throw cannot
+ be configured per device, so they are not available here. Similarly,
+ nat hasn't been supported since kernel 2.6.
+ '';
+ };
+
via = mkOption {
type = types.nullOr types.str;
default = null;
diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
index e3cfb2ed998c..1c67d307a00e 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixos/tests/ecryptfs.nix
@@ -11,16 +11,16 @@ import ./make-test-python.nix ({ ... }:
testScript = ''
def login_as_alice():
- machine.wait_until_tty_matches(1, "login: ")
+ machine.wait_until_tty_matches("1", "login: ")
machine.send_chars("alice\n")
- machine.wait_until_tty_matches(1, "Password: ")
+ machine.wait_until_tty_matches("1", "Password: ")
machine.send_chars("foobar\n")
- machine.wait_until_tty_matches(1, "alice\@machine")
+ machine.wait_until_tty_matches("1", "alice\@machine")
def logout():
machine.send_chars("logout\n")
- machine.wait_until_tty_matches(1, "login: ")
+ machine.wait_until_tty_matches("1", "login: ")
machine.wait_for_unit("default.target")
@@ -36,7 +36,7 @@ import ./make-test-python.nix ({ ... }:
with subtest("Log alice in (ecryptfs passwhrase is wrapped during first login)"):
login_as_alice()
machine.send_chars("logout\n")
- machine.wait_until_tty_matches(1, "login: ")
+ machine.wait_until_tty_matches("1", "login: ")
# Why do I need to do this??
machine.succeed("su alice -c ecryptfs-umount-private || true")
diff --git a/nixos/tests/ihatemoney/default.nix b/nixos/tests/ihatemoney/default.nix
index cd5f073343da..894a97d43d35 100644
--- a/nixos/tests/ihatemoney/default.nix
+++ b/nixos/tests/ihatemoney/default.nix
@@ -32,14 +32,7 @@ let
};
};
# ihatemoney needs a local smtp server otherwise project creation just crashes
- services.opensmtpd = {
- enable = true;
- serverConfiguration = ''
- listen on lo
- action foo relay
- match from any for any action foo
- '';
- };
+ services.postfix.enable = true;
};
testScript = ''
machine.wait_for_open_port(8000)
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index 0d6f81b17219..2cff38d20059 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -29,11 +29,11 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
machine.wait_until_succeeds("pgrep -f 'agetty.*tty2'")
with subtest("Log in as alice on a virtual console"):
- machine.wait_until_tty_matches(2, "login: ")
+ machine.wait_until_tty_matches("2", "login: ")
machine.send_chars("alice\n")
- machine.wait_until_tty_matches(2, "login: alice")
+ machine.wait_until_tty_matches("2", "login: alice")
machine.wait_until_succeeds("pgrep login")
- machine.wait_until_tty_matches(2, "Password: ")
+ machine.wait_until_tty_matches("2", "Password: ")
machine.send_chars("foobar\n")
machine.wait_until_succeeds("pgrep -u alice bash")
machine.send_chars("touch done\n")
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 2cc1e9b0942c..1fe1229f24a4 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -77,12 +77,14 @@ let
testCases = {
loopback = {
name = "Loopback";
- machine.networking.useDHCP = false;
- machine.networking.useNetworkd = networkd;
+ nodes.client = { pkgs, ... }: with pkgs.lib; {
+ networking.useDHCP = false;
+ networking.useNetworkd = networkd;
+ };
testScript = ''
start_all()
- machine.wait_for_unit("network.target")
- loopback_addresses = machine.succeed("ip addr show lo")
+ client.wait_for_unit("network.target")
+ loopback_addresses = client.succeed("ip addr show lo")
assert "inet 127.0.0.1/8" in loopback_addresses
assert "inet6 ::1/128" in loopback_addresses
'';
@@ -139,6 +141,25 @@ let
client.wait_until_succeeds("ping -c 1 192.168.3.1")
'';
};
+ routeType = {
+ name = "RouteType";
+ nodes.client = { pkgs, ... }: with pkgs.lib; {
+ networking = {
+ useDHCP = false;
+ useNetworkd = networkd;
+ interfaces.eth1.ipv4.routes = [{
+ address = "192.168.1.127";
+ prefixLength = 32;
+ type = "local";
+ }];
+ };
+ };
+ testScript = ''
+ start_all()
+ client.wait_for_unit("network.target")
+ client.succeed("ip -4 route list table local | grep 'local 192.168.1.127'")
+ '';
+ };
dhcpDefault = {
name = "useDHCP-by-default";
nodes.router = router;
diff --git a/nixos/tests/pam/pam-oath-login.nix b/nixos/tests/pam/pam-oath-login.nix
index c532e81e674d..dd6ef4a0abcb 100644
--- a/nixos/tests/pam/pam-oath-login.nix
+++ b/nixos/tests/pam/pam-oath-login.nix
@@ -77,28 +77,28 @@ in
machine.screenshot("postboot")
with subtest("Invalid password"):
- switch_to_tty(2)
- enter_user_alice(2)
+ switch_to_tty("2")
+ enter_user_alice("2")
machine.send_chars("${oathSnakeOilPassword1}\n")
- machine.wait_until_tty_matches(2, "Password: ")
+ machine.wait_until_tty_matches("2", "Password: ")
machine.send_chars("blorg\n")
- machine.wait_until_tty_matches(2, "Login incorrect")
+ machine.wait_until_tty_matches("2", "Login incorrect")
with subtest("Invalid oath token"):
- switch_to_tty(3)
- enter_user_alice(3)
+ switch_to_tty("3")
+ enter_user_alice("3")
machine.send_chars("000000\n")
- machine.wait_until_tty_matches(3, "Login incorrect")
- machine.wait_until_tty_matches(3, "login:")
+ machine.wait_until_tty_matches("3", "Login incorrect")
+ machine.wait_until_tty_matches("3", "login:")
with subtest("Happy path: Both passwords are mandatory to get us in"):
- switch_to_tty(4)
- enter_user_alice(4)
+ switch_to_tty("4")
+ enter_user_alice("4")
machine.send_chars("${oathSnakeOilPassword2}\n")
- machine.wait_until_tty_matches(4, "Password: ")
+ machine.wait_until_tty_matches("4", "Password: ")
machine.send_chars("${alicePassword}\n")
machine.wait_until_succeeds("pgrep -u alice bash")
diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix
index dd2a575b1935..50a9f7124646 100644
--- a/nixos/tests/shadow.nix
+++ b/nixos/tests/shadow.nix
@@ -39,9 +39,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
shadow.wait_until_succeeds("[ $(fgconsole) = 2 ]")
shadow.wait_for_unit("getty@tty2.service")
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty2'")
- shadow.wait_until_tty_matches(2, "login: ")
+ shadow.wait_until_tty_matches("2", "login: ")
shadow.send_chars("emma\n")
- shadow.wait_until_tty_matches(2, "login: emma")
+ shadow.wait_until_tty_matches("2", "login: emma")
shadow.wait_until_succeeds("pgrep login")
shadow.sleep(2)
shadow.send_chars("${password1}\n")
@@ -63,9 +63,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
shadow.wait_until_succeeds("[ $(fgconsole) = 3 ]")
shadow.wait_for_unit("getty@tty3.service")
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty3'")
- shadow.wait_until_tty_matches(3, "login: ")
+ shadow.wait_until_tty_matches("3", "login: ")
shadow.send_chars("emma\n")
- shadow.wait_until_tty_matches(3, "login: emma")
+ shadow.wait_until_tty_matches("3", "login: emma")
shadow.wait_until_succeeds("pgrep login")
shadow.sleep(2)
shadow.send_chars("${password1}\n")
@@ -81,16 +81,16 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
shadow.wait_until_succeeds("[ $(fgconsole) = 4 ]")
shadow.wait_for_unit("getty@tty4.service")
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty4'")
- shadow.wait_until_tty_matches(4, "login: ")
+ shadow.wait_until_tty_matches("4", "login: ")
shadow.send_chars("emma\n")
- shadow.wait_until_tty_matches(4, "login: emma")
+ shadow.wait_until_tty_matches("4", "login: emma")
shadow.wait_until_succeeds("pgrep login")
shadow.sleep(2)
shadow.send_chars("${password1}\n")
- shadow.wait_until_tty_matches(4, "Login incorrect")
- shadow.wait_until_tty_matches(4, "login:")
+ shadow.wait_until_tty_matches("4", "Login incorrect")
+ shadow.wait_until_tty_matches("4", "login:")
shadow.send_chars("emma\n")
- shadow.wait_until_tty_matches(4, "login: emma")
+ shadow.wait_until_tty_matches("4", "login: emma")
shadow.wait_until_succeeds("pgrep login")
shadow.sleep(2)
shadow.send_chars("${password3}\n")
@@ -109,11 +109,11 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
shadow.wait_until_succeeds("[ $(fgconsole) = 5 ]")
shadow.wait_for_unit("getty@tty5.service")
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty5'")
- shadow.wait_until_tty_matches(5, "login: ")
+ shadow.wait_until_tty_matches("5", "login: ")
shadow.send_chars("layla\n")
- shadow.wait_until_tty_matches(5, "login: layla")
+ shadow.wait_until_tty_matches("5", "login: layla")
shadow.wait_until_succeeds("pgrep login")
shadow.send_chars("${password2}\n")
- shadow.wait_until_tty_matches(5, "login:")
+ shadow.wait_until_tty_matches("5", "login:")
'';
})
diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix
index 8f95f2a030d1..52e2c7c99ec4 100644
--- a/nixos/tests/sway.nix
+++ b/nixos/tests/sway.nix
@@ -4,6 +4,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
maintainers = with lib.maintainers; [ primeos synthetica ];
};
+ # testScriptWithTypes:49: error: Cannot call function of unknown type
+ # (machine.succeed if succeed else machine.execute)(
+ # ^
+ # Found 1 error in 1 file (checked 1 source file)
+ skipTypeCheck = true;
+
nodes.machine = { config, ... }: {
# Automatically login on tty1 as a normal user:
imports = [ ./common/user-account.nix ];
diff --git a/nixos/tests/uptermd.nix b/nixos/tests/uptermd.nix
index d504ef064191..429e3c9dd5ff 100644
--- a/nixos/tests/uptermd.nix
+++ b/nixos/tests/uptermd.nix
@@ -42,7 +42,7 @@ in
client1.wait_for_unit("multi-user.target")
client1.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
- client1.wait_until_tty_matches(1, "login: ")
+ client1.wait_until_tty_matches("1", "login: ")
client1.send_chars("root\n")
client1.wait_until_succeeds("pgrep -u root bash")
diff --git a/nixos/tests/user-activation-scripts.nix b/nixos/tests/user-activation-scripts.nix
index 934573578187..5df072ce0508 100644
--- a/nixos/tests/user-activation-scripts.nix
+++ b/nixos/tests/user-activation-scripts.nix
@@ -19,9 +19,9 @@ import ./make-test-python.nix ({ lib, ... }: {
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("getty@tty1.service")
- machine.wait_until_tty_matches(1, "login: ")
+ machine.wait_until_tty_matches("1", "login: ")
machine.send_chars("alice\n")
- machine.wait_until_tty_matches(1, "Password: ")
+ machine.wait_until_tty_matches("1", "Password: ")
machine.send_chars("pass1\n")
machine.send_chars("touch login-ok\n")
machine.wait_for_file("/home/alice/login-ok")
diff --git a/nixos/tests/user-home-mode.nix b/nixos/tests/user-home-mode.nix
index 1366d102a99b..070cb0b75cc9 100644
--- a/nixos/tests/user-home-mode.nix
+++ b/nixos/tests/user-home-mode.nix
@@ -17,9 +17,9 @@ import ./make-test-python.nix ({ lib, ... }: {
testScript = ''
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("getty@tty1.service")
- machine.wait_until_tty_matches(1, "login: ")
+ machine.wait_until_tty_matches("1", "login: ")
machine.send_chars("alice\n")
- machine.wait_until_tty_matches(1, "Password: ")
+ machine.wait_until_tty_matches("1", "Password: ")
machine.send_chars("pass1\n")
machine.succeed('[ "$(stat -c %a /home/alice)" == "700" ]')
machine.succeed('[ "$(stat -c %a /home/bob)" == "750" ]')
diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix
index 355687798406..64f32a07e215 100644
--- a/nixos/tests/zsh-history.nix
+++ b/nixos/tests/zsh-history.nix
@@ -21,13 +21,13 @@ import ./make-test-python.nix ({ pkgs, ...} : {
default.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
# Login
- default.wait_until_tty_matches(1, "login: ")
+ default.wait_until_tty_matches("1", "login: ")
default.send_chars("root\n")
- default.wait_until_tty_matches(1, r"\nroot@default\b")
+ default.wait_until_tty_matches("1", r"\nroot@default\b")
# Generate some history
default.send_chars("echo foobar\n")
- default.wait_until_tty_matches(1, "foobar")
+ default.wait_until_tty_matches("1", "foobar")
# Ensure that command was recorded in history
default.succeed("/run/current-system/sw/bin/history list | grep -q foobar")
diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
index a1ca052f9c6b..287f439c94d5 100644
--- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl
-, libdbusmenu-glib }:
+, libdbusmenu }:
stdenv.mkDerivation rec {
pname = "deadbeef-statusnotifier-plugin";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ deadbeef gtk3 libdbusmenu-glib ];
+ buildInputs = [ deadbeef gtk3 libdbusmenu ];
buildFlags = [ "gtk3" ];
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix
index 870584d357eb..7e11c0a8d75f 100644
--- a/pkgs/applications/audio/mimic/default.nix
+++ b/pkgs/applications/audio/mimic/default.nix
@@ -1,4 +1,5 @@
-{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, makeWrapper
+{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch
+, pkg-config, makeWrapper
, alsa-lib, alsa-plugins, libtool, icu, pcre2
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
@@ -13,6 +14,16 @@ stdenv.mkDerivation rec {
sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id";
};
+ patches = [
+ # Pull upstream fix for -fno-common toolchains:
+ # https://github.com/MycroftAI/mimic1/pull/216
+ (fetchpatch {
+ name = "fno-common";
+ url = "https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d.patch";
+ sha256 = "0n3hqrfpbdp44y0c8bq55ay9m4c96r09k18hjxka4x54j5c7lw1m";
+ })
+ ];
+
nativeBuildInputs = [
autoreconfHook
pkg-config
diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix
new file mode 100644
index 000000000000..ed823f9b9c02
--- /dev/null
+++ b/pkgs/applications/blockchains/lndhub-go/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+}:
+
+buildGoModule rec {
+ pname = "lndhub-go";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "getAlby";
+ repo = "lndhub.go";
+ rev = "${version}";
+ sha256 = "sha256-CQVHU3gIIiucrz9TA2ltPNmj6d22vbraktBoyTHTQ1k=";
+ };
+
+ patches = [
+ # fix inconsistent vendoring
+ # https://github.com/getAlby/lndhub.go/pull/184
+ (fetchpatch {
+ url = "https://github.com/getAlby/lndhub.go/commit/2ee7ace9385f8626eb15cbf653ccd46423b5a9c5.patch";
+ sha256 = "sha256-1ESPlCTzpFbqshzS6xF4apY8Doz9GvEbZe93Z93P9EI=";
+ })
+ ];
+
+ vendorSha256 = "sha256-bp5q8K7OpvNo28jojaPPj53hUe+me4oLwDBkgZk+0Ec=";
+
+ doCheck = false; # tests require networking
+
+ meta = with lib; {
+ description = "Accounting wrapper for the Lightning Network";
+ homepage = "https://github.com/getAlby/lndhub.go";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ prusnak ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5207c48b19ac..385b0d2aadea 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -111,6 +111,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/";
};
+ Ionide-vim = buildVimPluginFrom2Nix {
+ pname = "Ionide-vim";
+ version = "2022-05-13";
+ src = fetchFromGitHub {
+ owner = "ionide";
+ repo = "Ionide-vim";
+ rev = "3092ca0fed470c01457d0cecbe5e108e2b008f0d";
+ sha256 = "0fbkmsqpnwrh8skv5yiva8y4aj4d7zm2z5vxbzl0hl6k728dwxvz";
+ };
+ meta.homepage = "https://github.com/ionide/Ionide-vim/";
+ };
+
Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
pname = "Jenkinsfile-vim-syntax";
version = "2021-01-26";
@@ -269,12 +281,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2022-05-29";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "18ffd42754ae82b2fb8bc86c035f315c43a57dca";
- sha256 = "1gd4v8n1q5pldkypz7sy48jksdi1w384kbi4fw3pqjp3knkdfqmd";
+ rev = "af73c24dfbc245a99a16d30444003fa86267d254";
+ sha256 = "04d8jwwrfdlcdvn2jvmw6n9ih9zz5a4aympyzmsnnnc8kgzzjk5j";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -329,12 +341,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
- version = "2022-05-29";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
- rev = "a8922726165031cc99d78018eafb0be8dca68b2d";
- sha256 = "1s68j8mzz54njfxhbcr2gkc8hjzla18si0a2cnmxzqpf0z92757k";
+ rev = "4397ec5814e311f9079e5ac3d54190fe0fac4a47";
+ sha256 = "0vf0qr5xj7p78z6br1wdj3la88xa5xb4dk8sk2nsrvayzl0xqvgz";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@@ -486,12 +498,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
- version = "2022-05-30";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "e633f0d836827b225ff3275da458e6e8a47a084f";
- sha256 = "0aj9klbx2g744gwvgcnx0b8nqnmp5mlf95h85hy7ay2h1jaw9lyi";
+ rev = "ece90c4820e7cea7be0aade9d19ef11f53bbc028";
+ sha256 = "1wb2hs4navxmr6d3ify653w7wwpg32zrvpqb2kc413rsaxhbw5q0";
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
};
@@ -522,12 +534,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2022-05-29";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "876140832cd33e0566c5a30a755939e088925e66";
- sha256 = "15zii6c7ari89limfrw09vpj42rmsc38x0pq43vsz6j96xhz57ic";
+ rev = "9bdc923624a489aa4c0a44cb1c77b984ad90e8ba";
+ sha256 = "1s6ba5h0cv8y80x2nv9m98q724xv242nqzgxxh7bniakzp3jm4j4";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -762,12 +774,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
- version = "2022-05-27";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "3ff68b8ce6c777cc12a452d8ee265a0b0788d475";
- sha256 = "0zkqgyj5prs1anzbggrnijyfygkmw2xrpd6nbnyqp8rr7yvdqz7i";
+ rev = "0bd9de963bcc5c35e9cb9f8bcf2035042927503f";
+ sha256 = "059brc6lc87n9ghfj5b9l1pygq5if9yp56prj46ig1w8ad5lgsd4";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -894,19 +906,19 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
- version = "2022-05-29";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "e2b1e99deb077bf49f8e167d1320292e66b22477";
- sha256 = "1m7jxmf9gfnqz3im167dbviw820clagl1yanp2x556zh94jxp4hf";
+ rev = "e9697f74612f90cc1fac7b5a973e1aa1323f9aff";
+ sha256 = "1f5qarhf9d3i0b40l9lyigjfpgx9ji3lalw0zbgs0iwga28q2sih";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
bullets-vim = buildVimPluginFrom2Nix {
pname = "bullets.vim";
- version = "2022-06-01";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "dkarter";
repo = "bullets.vim";
@@ -990,12 +1002,12 @@ final: prev:
circles-nvim = buildVimPluginFrom2Nix {
pname = "circles.nvim";
- version = "2022-05-29";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "projekt0n";
repo = "circles.nvim";
- rev = "a1d72d2e775b187028ee992c422ff1db92ceea4e";
- sha256 = "0nrv56f43mfkwaw53yyyhxmhgjcfvz9q7c6yqrchnj9gh62x22b5";
+ rev = "1d1bae3dd7669efcb8d394c6c78d7c32c5c16f71";
+ sha256 = "1hg89i080xy7wqwsqfhybkfp09689dynjxc86wp2g09rf4lxkgjs";
};
meta.homepage = "https://github.com/projekt0n/circles.nvim/";
};
@@ -1012,6 +1024,18 @@ final: prev:
meta.homepage = "https://github.com/xavierd/clang_complete/";
};
+ clangd_extensions-nvim = buildVimPluginFrom2Nix {
+ pname = "clangd_extensions.nvim";
+ version = "2022-05-31";
+ src = fetchFromGitHub {
+ owner = "p00f";
+ repo = "clangd_extensions.nvim";
+ rev = "81b56d41d8ab791509a8464b0afc54144be9f23d";
+ sha256 = "13mainbpndl3mlvalghkvykbqjpvdp5pbhk5ma93vgj38sk6ph0d";
+ };
+ meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/";
+ };
+
clever-f-vim = buildVimPluginFrom2Nix {
pname = "clever-f.vim";
version = "2021-07-07";
@@ -1386,12 +1410,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
- version = "2022-05-28";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "d6287a8c6c40fb2aafb7c763b9a262d48de48760";
- sha256 = "0ra8pia1l18y23pby4nmd665lylbxh72s5nsc7x9gv7phj3l7q6g";
+ rev = "102fe82be44e878d6eefdab2cb2fc4aaa5a346f3";
+ sha256 = "0j5xhs1p14z0x622mxf5dsgj0byic26rc02xs1g3hm1hmy1fj530";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -1444,6 +1468,18 @@ final: prev:
meta.homepage = "https://github.com/lilydjwg/colorizer/";
};
+ com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix {
+ pname = "com.cloudedmountain.ide.neovim";
+ version = "2022-05-19";
+ src = fetchFromGitHub {
+ owner = "Domeee";
+ repo = "com.cloudedmountain.ide.neovim";
+ rev = "d5d6c5151e8643abfabd22e9fe7e31467c679be2";
+ sha256 = "1h2379ibzadv7549i13zjzavya7n7q8z532awvwqdr8incja5b4c";
+ };
+ meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/";
+ };
+
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
version = "2022-05-28";
@@ -1627,16 +1663,40 @@ final: prev:
copilot-vim = buildVimPluginFrom2Nix {
pname = "copilot.vim";
- version = "2022-05-20";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "github";
repo = "copilot.vim";
- rev = "ad102c7a58356414f18680f60c2298246e41ccea";
- sha256 = "0pnb7mb889nf963flgmp9kzc7bxkgih8pgx7zrmv56qmzlch1mii";
+ rev = "042543ffc2e77a819da0415da1af6b1842a0f9c2";
+ sha256 = "1anyphnyrigidsmqlczf92y46v8zi9gz3zlnzzyw1dkpp0dzm15h";
};
meta.homepage = "https://github.com/github/copilot.vim/";
};
+ coq-artifacts = buildVimPluginFrom2Nix {
+ pname = "coq.artifacts";
+ version = "2022-06-04";
+ src = fetchFromGitHub {
+ owner = "ms-jpq";
+ repo = "coq.artifacts";
+ rev = "d89dd1f003cdaca6a08f87894d99de77ffb077f2";
+ sha256 = "0n2naw94asbw4dqnzpkjmxwmgyfyw09fk7a42111n44mb48xi9qc";
+ };
+ meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
+ };
+
+ coq-thirdparty = buildVimPluginFrom2Nix {
+ pname = "coq.thirdparty";
+ version = "2022-06-04";
+ src = fetchFromGitHub {
+ owner = "ms-jpq";
+ repo = "coq.thirdparty";
+ rev = "da33c118f5a69776cfc85e7db102a0bf88984dc2";
+ sha256 = "0kkadnbk1176d4ykz6hcsi7nkc1vmk0x1h1q2d9zb61l4h5agxmh";
+ };
+ meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
+ };
+
coq-vim = buildVimPluginFrom2Nix {
pname = "coq.vim";
version = "2013-01-16";
@@ -1651,12 +1711,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2022-05-30";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "fa9607249fc2e073ce8fa3805a49f86569d819e3";
- sha256 = "1bjr3s5xy2b7a50b4cqzyc6bvkm4sn90530ss0jlgxfyxc8bv046";
+ rev = "0a7e549cb0a3e4c7eeb54e3719457600e702de96";
+ sha256 = "1n96sv9kk5igcgdx291c8lr5y6b5wavsycq0mdg60h7078d21cd3";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -1687,12 +1747,12 @@ final: prev:
crates-nvim = buildVimPluginFrom2Nix {
pname = "crates.nvim";
- version = "2022-05-02";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "saecki";
repo = "crates.nvim";
- rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383";
- sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q";
+ rev = "cceea1a4f2d0131f43b6d17ad5c793aded19443b";
+ sha256 = "1hx53p8zgpaa6ql9z50gfcjlspsdd3p2hz1yak9r5qp9j94fk1as";
};
meta.homepage = "https://github.com/saecki/crates.nvim/";
};
@@ -1709,6 +1769,18 @@ final: prev:
meta.homepage = "https://github.com/godlygeek/csapprox/";
};
+ csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix {
+ pname = "csharpls-extended-lsp.nvim";
+ version = "2022-03-08";
+ src = fetchFromGitHub {
+ owner = "Decodetalkers";
+ repo = "csharpls-extended-lsp.nvim";
+ rev = "a1985fd1cd3c67d5e1b1be7c9283222fd46e7615";
+ sha256 = "159mlvz9bb91v8nld2g52r0v4gbdp182l489jdm5pvxc5yf5zl3w";
+ };
+ meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
+ };
+
csv-vim = buildVimPluginFrom2Nix {
pname = "csv.vim";
version = "2022-01-12";
@@ -1783,12 +1855,12 @@ final: prev:
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2022-05-09";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "3b31a80513969752a8c53ff8b16a8e060404cf50";
- sha256 = "0gcjyywjdsigq7a4jmcg8zgj6na5zagncdgp2a5qs81sa962k798";
+ rev = "b661c8118b902dbf9ad86018ce48781ee8466612";
+ sha256 = "0106jhw9fg2zmk0fqnr126f9gnh5bw7sjrxldn06ajj15ll15p9p";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -2157,12 +2229,12 @@ final: prev:
diffview-nvim = buildNeovimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2022-05-28";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "08e4340f690d0b611a393eafb633b2fb62f78601";
- sha256 = "0v7fabqw5ld4s9s3r8wblj7cjf3nbvhgnzawiip0jl4xi77d454d";
+ rev = "3ffe4a70c4b434ee933cb869b1706632c4407495";
+ sha256 = "04xma63803bprwjynj6nsybiz56h5wzrj8jbfj05hf24q9bbklfd";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2193,36 +2265,36 @@ final: prev:
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
- version = "2022-05-30";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
- rev = "b2406a0ea7b88177219ed475a14bc490a4653323";
- sha256 = "009867kvvzn6kf07la4wbisfbkyxlmj5sgzs83mh75r8j9al7j8n";
+ rev = "1706d00209ee250be56029f8c5b439daa19a1411";
+ sha256 = "0wkixp0gc001hgryqxkm5hdw1pcbjxndz2x4za1b7djq340n9md4";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
echodoc-vim = buildVimPluginFrom2Nix {
pname = "echodoc.vim";
- version = "2021-11-26";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "Shougo";
repo = "echodoc.vim";
- rev = "42b7fb45c6a45e90410203d9c248b79bc46ea933";
- sha256 = "14as4q6dnc540in68039c1bbdn4ag86872pbra6h06s5rbhbgzky";
+ rev = "945cdbbbd0e3c93d6514c0283425c32c35cddb17";
+ sha256 = "0jqy96mc5kdgh7gxcxlgl94fvaxgazhkwkydki78vpgszvshrbry";
};
meta.homepage = "https://github.com/Shougo/echodoc.vim/";
};
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2022-05-26";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "2f2683f918fa1a90f41650682bb53819fc0c1849";
- sha256 = "0vl3ffrdaz38qax9k2lfvw2wlj94688w6gd1831is17dm9wv50ys";
+ rev = "2c7c3a1bfbd7ce1a62ef61e6cfdcdb9e8c04d1f0";
+ sha256 = "0g3az80iisdbk5w6yqhpw8ws5jh82hzqwq8y6808n3f0ki1b5mz9";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -2303,12 +2375,12 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
- version = "2022-05-26";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
- rev = "ee24cd4bde3fea5c536a6a319900683825b16adc";
- sha256 = "1s5d85rjwyqpamidkjwsn52l2pdgz96rspmq6nx5lnis5gdn5idr";
+ rev = "eca7c8c196215f687319295c81e6ba1d4e2f53a4";
+ sha256 = "10jfag6ngarq2gnwlz4w7b0ckm9j899lppznz4sbrhisv35l4mjf";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
@@ -2363,12 +2435,12 @@ final: prev:
feline-nvim = buildVimPluginFrom2Nix {
pname = "feline.nvim";
- version = "2022-05-27";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "feline-nvim";
repo = "feline.nvim";
- rev = "fba1aaa74ceb0df222a556c6ca0db8f303fa893e";
- sha256 = "1nlryj4jivlmgbr2j0dvhv9z0nk93gzl8kix76wn37z9prd8zci4";
+ rev = "1ea42671c523a080a01c62c40c2c8e7fc0139a8f";
+ sha256 = "0yrkdzikpcq9phybbzfggdfj4y983y9qw1fvnzpvff7mp11jskqw";
};
meta.homepage = "https://github.com/feline-nvim/feline.nvim/";
};
@@ -2482,6 +2554,18 @@ final: prev:
meta.homepage = "https://github.com/floobits/floobits-neovim/";
};
+ flutter-tools-nvim = buildVimPluginFrom2Nix {
+ pname = "flutter-tools.nvim";
+ version = "2022-05-19";
+ src = fetchFromGitHub {
+ owner = "akinsho";
+ repo = "flutter-tools.nvim";
+ rev = "9301eeb3f1b4ea15845ee72f778b6af7bad60321";
+ sha256 = "0c1f7cljpa6mndk1aqs1w64jlhjjybfbyqs0s4g1jdcz5a7b4fqi";
+ };
+ meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
+ };
+
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
version = "2022-05-16";
@@ -2820,12 +2904,12 @@ final: prev:
goto-preview = buildVimPluginFrom2Nix {
pname = "goto-preview";
- version = "2021-12-25";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "goto-preview";
- rev = "7f842e981f81cce14f28c49befad9146c18c3931";
- sha256 = "018lf4z50j25j5y3lhcw1al2jp6dm9xy39mi9732zx4wa8my8gix";
+ rev = "37116fb5167d2a93cada8db9135c5032a25348a7";
+ sha256 = "0mrayyzc4z70rr9c66iwpdqk475pbmgvqanq5nakx1a19blqkkzj";
};
meta.homepage = "https://github.com/rmagatti/goto-preview/";
};
@@ -2842,6 +2926,18 @@ final: prev:
meta.homepage = "https://github.com/junegunn/goyo.vim/";
};
+ grammar-guard-nvim = buildVimPluginFrom2Nix {
+ pname = "grammar-guard.nvim";
+ version = "2022-01-03";
+ src = fetchFromGitHub {
+ owner = "brymer-meneses";
+ repo = "grammar-guard.nvim";
+ rev = "ea163c4adfd68fdd40e095cdf39cb506bf3ce3b2";
+ sha256 = "0wdbpkg1y0s7fhaybyj735dxdkvfgnng49i8k0zrsy16d75md4bs";
+ };
+ meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/";
+ };
+
graphviz-vim = buildVimPluginFrom2Nix {
pname = "graphviz.vim";
version = "2021-04-09";
@@ -2880,12 +2976,12 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material";
- version = "2022-05-26";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "gruvbox-material";
- rev = "b47a19b27273f6e02e5342a448a5f82c9bd377f9";
- sha256 = "0iz3a9s4m8bmaghdd84yjr2hlib3gnm3khjavq97cknsid3cakgh";
+ rev = "8aba3586fdefbdad3f758e24799245b799ae5a6f";
+ sha256 = "03hkgzirnjahi44xwbzmpcbzpj4lgydq07wva32cyyrv3h8qplar";
};
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
};
@@ -3024,12 +3120,12 @@ final: prev:
hotpot-nvim = buildVimPluginFrom2Nix {
pname = "hotpot.nvim";
- version = "2022-04-24";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "hotpot.nvim";
- rev = "f481b30f1d93df6016092623199ddc8bfe1624d0";
- sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj";
+ rev = "21258d4194a606d8d53bf68d06cc25457b2e8449";
+ sha256 = "0ily343jzx9ra2mxp1flmshsl5bara0wx10fgyrrps1cfag383jm";
};
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
@@ -3397,12 +3493,12 @@ final: prev:
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
- version = "2022-05-21";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "2cc1642188f61778c8c7212b98d01f1a36e89a07";
- sha256 = "0wbd4agk21zn1icnn79s1dpx8nz6g6j0sfi7jif06w4yysj7cj98";
+ rev = "2be99e3fa33ab24beb035ed46c51b353fc373cd5";
+ sha256 = "0235cc6wcir4qgv9yksrj3ycd3w44w2gkb1zn0yljd5ygi3xp2mz";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -3649,12 +3745,12 @@ final: prev:
litee-nvim = buildVimPluginFrom2Nix {
pname = "litee.nvim";
- version = "2022-05-19";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "ldelossa";
repo = "litee.nvim";
- rev = "f181c7674e8a826ef66d1f67f23e92631477bb7c";
- sha256 = "0zq4l46c6q8x27lkyzjji1d4i8q5b5s2x198a427d87ps1dswv85";
+ rev = "de1a3d65c0917bcb933ad023768f6b6e74f6ca92";
+ sha256 = "1qmvqh9xw8y7vgnc532glcgv94mbwr0ilaiw100ri2qlr9lri2np";
};
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
};
@@ -3744,12 +3840,12 @@ final: prev:
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga.nvim";
- version = "2022-05-18";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "tami5";
repo = "lspsaga.nvim";
- rev = "39b6faccb57fd640a06c7d73a30507b13263fcbf";
- sha256 = "09xym8gbrabr0y8bwkb4aq3iwdrd6yb9104gzy7l180pvrjq58qn";
+ rev = "e4beaeff66ae4f70d0b67fe045b70d78780bb947";
+ sha256 = "1in3yhbr535xrzgnm6n8623xgqm73djphv2xnd1q84psr1lrkzb7";
};
meta.homepage = "https://github.com/tami5/lspsaga.nvim/";
};
@@ -3780,12 +3876,12 @@ final: prev:
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine.nvim";
- version = "2022-05-22";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "nvim-lualine";
repo = "lualine.nvim";
- rev = "c12b1673107c181e32ce54f2dc4c76a2a884d7ba";
- sha256 = "13msrlhwm8vsnk50gfx8lzswk50qgzx7namdh6gm1aw4ckmwfsyc";
+ rev = "3362b28f917acc37538b1047f187ff1b5645ecdd";
+ sha256 = "0pfkh7zhnwhbfdcild5vayymw4vqzcfb31nq1y33pk1zlvpwxksv";
};
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
};
@@ -3900,12 +3996,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2022-05-26";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "75477368c63e3dee65b2a39e6050391ef521f0b8";
- sha256 = "1i9x44m9f6nakv1vb2pxij7b71pyblm2w55nlbbklja19diggw3n";
+ rev = "6adaf4c42455c093f00d0df3882ab48838423a57";
+ sha256 = "0198f7818m58h2bxgdnfnx5nm7vxi2psssx105dn6ndg55yf2qsx";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -4248,24 +4344,24 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2022-05-27";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "c010862fa151f1d6a009d94a0acbe49514781cdc";
- sha256 = "08y0srr1i5n7d15w3shp8cdj4gqhdxpb6311k879amb28am5n8zk";
+ rev = "e8ce68ba5b57df18b54b96adb80ad533c7a2eb3d";
+ sha256 = "09ylazsa933dqhx0x9qc4v2ackqvr22dpzbgyhkvqfs476fj5pn4";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2022-05-16";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "1453acd27c38fb4374093bc5c2c85dd1fc03d689";
- sha256 = "1hrk8p0ma43p30ka8zv3k0czv66qxy88kmv34m5lc813qsrzhivn";
+ rev = "441c23d355b77f4067a1ad018c5dba64efd7ff7f";
+ sha256 = "0yay92x3jmvpgqhx0hv0w19fjisakmmdzd286m656v5g26hmfxj1";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -4320,12 +4416,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2022-05-26";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "d63ad5129b935b84f975df12c9669a466d7c6c23";
- sha256 = "1w6mwy6pan0cpm997lwx2fm45lfd4mm2lw8adpivlkw3jknaallk";
+ rev = "535fca8fd422fdedd686825d1f59a4e40e00259e";
+ sha256 = "16yvvqmr7hg5g23ndig65y6by1y2khac1j9lmibvf91sxqdqrhxr";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -4368,12 +4464,12 @@ final: prev:
neoterm = buildVimPluginFrom2Nix {
pname = "neoterm";
- version = "2022-05-27";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "kassio";
repo = "neoterm";
- rev = "5343120620544c00c98e0f52cb15a76944b74fee";
- sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq";
+ rev = "4881d6428bcaa524ad4686431ce184c6fb9bfe59";
+ sha256 = "1i98sfb7vb0fx16zl15lf6ac65f1j0h9hbskmfk6zdiqcfcwhx4f";
};
meta.homepage = "https://github.com/kassio/neoterm/";
};
@@ -4476,12 +4572,12 @@ final: prev:
neuron-vim = buildVimPluginFrom2Nix {
pname = "neuron.vim";
- version = "2020-12-06";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "fiatjaf";
repo = "neuron.vim";
- rev = "0b820b2191bf239c38e62ffa63501333590d6810";
- sha256 = "0x00y0a46jwqq9gx741m3j7p78ps7nycp5hl3bjxqmwj289gc12y";
+ rev = "e4e7f0b012d39d8e5dfb7d13ca199eaa130279ba";
+ sha256 = "06qqbg4d0gk8d236f08sr847m5icbfknxsya2q3f52alnlpjry32";
};
meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
};
@@ -4500,12 +4596,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
- version = "2022-05-25";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
- rev = "b37efa583fe7edbf347a25ff5ce07514c9316c88";
- sha256 = "19gx3vr0jz8b26vlfmg13nx70r411i6xdn6k5nsalf6lfapp01ky";
+ rev = "e602acaad91a546be2250e026f0bdc6be8c8a44c";
+ sha256 = "0666alx5yh6kzh417x4wydijh7aslxl4mivjzcvi74zr46h1xwz5";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -4548,12 +4644,12 @@ final: prev:
nord-vim = buildVimPluginFrom2Nix {
pname = "nord-vim";
- version = "2022-05-14";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-vim";
- rev = "d32b4dd6aa494c7e18aed11222fb8fed2034c515";
- sha256 = "0k1bhr2nyqrr350bp6jcp1l4x67yjdqfnq922ywyaaji1adbr1i1";
+ rev = "bc0f057162491e9228207d74bd88b5efe875316e";
+ sha256 = "16fm573my8ysmcy68wy9kxwrm85q8fmpggwr83z1gwq3mmws59xy";
};
meta.homepage = "https://github.com/arcticicestudio/nord-vim/";
};
@@ -4608,12 +4704,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2022-05-30";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "5ef0680d66d4fbebdcc8bed8cabe056470c802ff";
- sha256 = "1xlflkd2zivc0dd6w84b27i9wcx99dp5jw2j8gq8a7n54043jwq4";
+ rev = "7b8560d53045f36d74236d17f0b280ec94e65198";
+ sha256 = "0pnp79l7ml97l25xm5c7g9ywnjqb2b9wvzlxp82apqns4qmgq9c2";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -4680,24 +4776,24 @@ final: prev:
nvim-biscuits = buildNeovimPluginFrom2Nix {
pname = "nvim-biscuits";
- version = "2021-11-12";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "code-biscuits";
repo = "nvim-biscuits";
- rev = "15a0cb1273bd36d5a734210cdc3406fb4bcfb733";
- sha256 = "15incx76ps8k4bra3s6ml66ckjhzjgbc7q2njs61yzfg46vdbhsd";
+ rev = "ed33933c1b4098f11ef61c06e2db76974490044d";
+ sha256 = "17pd72djkmqivdkpx9awr9irwysmgsimh9mabd4dha4kjh1ar32j";
};
meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2022-05-24";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "f1551f355ce418dfa435bf972c53c4f385d6287d";
- sha256 = "0vfd9hfwgcca7nypppisz9xi5d43420gb0rvfrggppjwfrsw3cj9";
+ rev = "0cc539c52e51d32d8febf1f04c5e7ed5353fead2";
+ sha256 = "1kljchr83ms3f7nc9lvy3fnvqv13xmh3xksyyazs0ivk20wgmbb3";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -4824,12 +4920,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2022-05-26";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "0062c19424ac751f47227b440c3d6c7e584687ff";
- sha256 = "1a3isml45wp6sdwhyc7ch4z1vpfv23lrcnnljykk2dp5iznfa3da";
+ rev = "9c783d8d2a6f776ee817281f0bf07d356524cc1f";
+ sha256 = "0rg4riwb8fbm661j1bmp1ffi04cfy4y5asmx0a8j9yyaz6bsn0d3";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -4896,12 +4992,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2022-05-12";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "9c630705829fbe8c21a9379ae2be948560189d80";
- sha256 = "1cdc2r12k1nma37vicshy4kbk79ap8qj040rscxzl41z96ff8v0b";
+ rev = "713e333d3d5cecaaee20c1e4d55fb5a344b5ca2e";
+ sha256 = "19jm1i5z1y3bfyp92rwjmbxjalhp3anbmfafhrp10f7sd3mbcxhf";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@@ -4956,12 +5052,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2022-05-06";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "f582b5be2ae1fee2e5dc974cd9b979a1ab08cca6";
- sha256 = "0bfdp6xbq7qr7185m06ccfmln2gc24vc1215cxczm1bpyrh98ncq";
+ rev = "72a40cdcde653df645644375307b4ea0cb658281";
+ sha256 = "180v9810bmnh9xf74sq7nrgv98iva5xpka9yyhqp7n9li7c7xp93";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -4992,12 +5088,12 @@ final: prev:
nvim-lightline-lsp = buildVimPluginFrom2Nix {
pname = "nvim-lightline-lsp";
- version = "2022-01-06";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "josa42";
repo = "nvim-lightline-lsp";
- rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8";
- sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6";
+ rev = "0fe34eed830b223770111c6333fe48d9fca158d5";
+ sha256 = "08qxyr998d7zwnk0czfq4hif0q801fm2ijpbwql32kd6a62bnhjf";
};
meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/";
};
@@ -5028,12 +5124,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2022-05-22";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "b86a37caf7a4e53e62ba883aef5889b590260de9";
- sha256 = "0bp1wqiwngrcl4isnnk12v3kzzrvjfbwhx79jvfzqnlqnl9q4m1p";
+ rev = "2a455c148341c4faf2dd60401397fed35d084c59";
+ sha256 = "1plhjirvg4xvh147xdr339z7jvw2mf973rkahhgxfwfzp1g1gjq9";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -5052,12 +5148,12 @@ final: prev:
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
- version = "2022-05-27";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
- rev = "9f8272802d35928df6c739f8e06f0e2767ad53a7";
- sha256 = "1h918npmwf46ddrr7hfdxgbmfvdvczhxb8lpdwqia76zx1pz14qs";
+ rev = "6738fe3c0e2142de01c753f8b7c18281d11488ce";
+ sha256 = "19k330fv68z9icdlbf6bjn8ckwrjkdn9k9hl4r4ss95lm7sfgzd8";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
@@ -5088,12 +5184,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2022-05-16";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "c6ca279271f03db5ee03523d1c312ba624d3fa75";
- sha256 = "096pk6gzxvwg55acz9r3wmrmdbz9s0ccyikmm0r91y42aa13xl73";
+ rev = "b517277b2782b9fe20f64220435b8b6f9f02f840";
+ sha256 = "0najyal8r9a443jqyv84sgpa235lkms2ggy835i4pb47azizwmfa";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -5160,24 +5256,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2022-05-30";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "8198fa01fcb1469b20a268d6f9f0c5f7dbedc424";
- sha256 = "14s914imkfxwbwk2a0vrq9r1s4hy1lsy2crf2h2p7g9cm7y0mkhd";
+ rev = "3aeb59b0754afb60751cd58b9903852b6076cea4";
+ sha256 = "0zw9rafhc4s9fhk53a4mxy9kspmcizzii1phvs2hib34laj78gwb";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2022-05-29";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "8c56988d79f95a9d75b001a0a9e302f7b1c4b384";
- sha256 = "17qii6j681v06f6kmj7p2hbrcjpvdqicii7lfnz81dq1ga522mkw";
+ rev = "d7ec2e6ab938b60baa5a9f4cd46d1d88d6da22ac";
+ sha256 = "03y5zl1drl1p072980kd247ksqlh33kvk0sjq1iaplwjmbxkmjfg";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -5268,12 +5364,12 @@ final: prev:
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
- version = "2022-05-26";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
- rev = "8a3ab5eb181b5a10d6ed031f3eeafa1acd2058f9";
- sha256 = "0yvzhv8m6zbrgnfa8x4z8sii2jx2rs4l96y5zh368ywn4ih7p8d8";
+ rev = "8d2c5337f0a2d0a17de8e751876eeb192b32310e";
+ sha256 = "0jb25z0bw2xyix18pf59lrmbnih8yxxkb81xi9zl034k9l9cmsv3";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@@ -5352,16 +5448,28 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
- version = "2022-05-23";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "5517cbdf302be2abc4ac43e5b8b2a812d0222bbb";
- sha256 = "0lndw6dhkwqm6kx5d9iizdjkvmk45yzrbx05fz6cz22mmyzrxka2";
+ rev = "a23c1f1c810c543d9da69a8a6feb2061738fc714";
+ sha256 = "0jy2az08il2w4wyabggmqhmi8cgmyqmm4x4zypvkv8qs7m9l72kq";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
+ omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix {
+ pname = "omnisharp-extended-lsp.nvim";
+ version = "2022-05-10";
+ src = fetchFromGitHub {
+ owner = "Hoffs";
+ repo = "omnisharp-extended-lsp.nvim";
+ rev = "e0dbe96194465f26e2cfff5d170ba8c88287e329";
+ sha256 = "119pc3va1g76clvm6c09jldsybjqml8fycx23lyh85f00jrwr2y9";
+ };
+ meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/";
+ };
+
one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim";
version = "2021-06-10";
@@ -5448,12 +5556,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
- version = "2022-05-29";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "35f4fb6faf7b26d8c09e382092f0ece0bc11ebd7";
- sha256 = "10iwn09sjcbckphpndrnhn76ls336gybwm53iwji582shyx6wmsf";
+ rev = "b0649b59144338d3a6d6bd04425a98acd203e413";
+ sha256 = "1q5gxmsjnchp39py0dv4gl4fy0fhjlca1calnlq4vil63yr4jpry";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -5472,12 +5580,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer.nvim";
- version = "2022-03-23";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "4dedd3b08f8c6e3f84afbce0c23b66320cd2a8f2";
- sha256 = "09sqfak384lhqr37003bq4wm9v0hi690ilag89z6cw5c0fnsysbl";
+ rev = "00ec5adef58c5ff9a07f11f45903b9dbbaa1b422";
+ sha256 = "1rgff84r4h5va58652ylspsdv9zhya46fak55spb69m5f9wh2vn5";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -5496,12 +5604,12 @@ final: prev:
papercolor-theme = buildVimPluginFrom2Nix {
pname = "papercolor-theme";
- version = "2022-04-30";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "NLKNguyen";
repo = "papercolor-theme";
- rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c";
- sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c";
+ rev = "7cd968118f6d00d7c9b7d946f88476ad4f2cbbd3";
+ sha256 = "0yixp5a8gl6bvsp3341zzyil8fjr02g2s2xplqw3y5r16afcqngz";
};
meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";
};
@@ -5592,12 +5700,12 @@ final: prev:
plenary-nvim = buildNeovimPluginFrom2Nix {
pname = "plenary.nvim";
- version = "2022-05-21";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "1da13add868968802157a0234136d5b1fbc34dfe";
- sha256 = "019kj1iv941shzzj8343yqavw894f4819r5h58p4fhs3fk40qq6b";
+ rev = "54b2e3d58f567983feabaeb9408eccf6b7f32206";
+ sha256 = "1ldjdc7yq4awlllr9dcv8fnkcwgdpvj0py5mhvx3v1yjniwrkn2i";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -5870,12 +5978,12 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2022-05-28";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "0210e88fdcc8032046289ed654ef39779d97e343";
- sha256 = "11mjx1r1cjagf15yii3rjf09is3y68kd6gacgfp71z39qxqgicm9";
+ rev = "8aae61389d3654335b2fd913d137f4908d482717";
+ sha256 = "0jk6cmng7cyxwdb5a7pnrvhaha32sj225zpjrng52yr1s9zg9hrl";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -6207,12 +6315,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2022-05-26";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "4cb3cae7d95e452569962d9ba05deb0e48ec4c12";
- sha256 = "1rccaaca1l0hc5hv1js831k5sggvzkp3zin5narwa7p20w6jqm3d";
+ rev = "c2f8a7259e4b67fb4d0242afababbb1dda3285a3";
+ sha256 = "1ni8b2b3cqqmi8lr4dh2f5bwnxwcdwqdjfvvds4m8jq2s3kql4bh";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -6277,6 +6385,18 @@ final: prev:
meta.homepage = "https://github.com/edluffy/specs.nvim/";
};
+ spellsitter-nvim = buildVimPluginFrom2Nix {
+ pname = "spellsitter.nvim";
+ version = "2022-06-02";
+ src = fetchFromGitHub {
+ owner = "lewis6991";
+ repo = "spellsitter.nvim";
+ rev = "430a25393abbf482bddf03c224cd5b8eeb27b5e1";
+ sha256 = "1cypvpyaarn9ckin2cgf2hpsq5qj517pz64imvyckzg22x9cf6yi";
+ };
+ meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/";
+ };
+
splice-vim = buildVimPluginFrom2Nix {
pname = "splice.vim";
version = "2020-01-15";
@@ -6570,12 +6690,12 @@ final: prev:
tagalong-vim = buildVimPluginFrom2Nix {
pname = "tagalong.vim";
- version = "2022-05-16";
+ version = "2022-05-31";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "tagalong.vim";
- rev = "04a6102cfa67e3e384593ced2226d4c054d379d9";
- sha256 = "1kjblsn5gglqz57vinlghjknn3s39q2r11vdqgk2xfdaqvrvfhk5";
+ rev = "7b8cf57d8b5cbf5ece29e8198e72e8db39d9fe26";
+ sha256 = "0qs9vrqc84v62g1qmlf5h07g4s97gg83mvl9jskcz2v3m7wxa6x3";
};
meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/";
};
@@ -6690,12 +6810,12 @@ final: prev:
telescope-file-browser-nvim = buildVimPluginFrom2Nix {
pname = "telescope-file-browser.nvim";
- version = "2022-05-28";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-file-browser.nvim";
- rev = "ea7905ed9b13bcf50e0ba4f3bff13330028d298c";
- sha256 = "0zzbgm9v0rzdk9c04qjhi3k6wgkp4k6rplw8lqq1wxxa0ffwvqgz";
+ rev = "61a5521853ac739ae3d0d395f52c1178108e0114";
+ sha256 = "18zr37rcr0f0066zkp5v3yrji3y1b48dj0sn4zf543pglppz2kz6";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
};
@@ -6714,12 +6834,12 @@ final: prev:
telescope-fzf-native-nvim = buildVimPluginFrom2Nix {
pname = "telescope-fzf-native.nvim";
- version = "2022-05-15";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-fzf-native.nvim";
- rev = "2330a7eac13f9147d6fe9ce955cb99b6c1a0face";
- sha256 = "107qh744nw316clvm5nhn2xlb663j59bq346lal12mlvd6wkrsbc";
+ rev = "f0dba7df9536ddb0c8f7b6482ede77940d728d23";
+ sha256 = "1fyww6h5y8624qn30j6297ipjs4h5rbn1af1fslwn3cz0qsfww2h";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
};
@@ -6859,12 +6979,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
- version = "2022-05-29";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "54be102e20ee4acaaa17e9fce8be07fb586630df";
- sha256 = "0w4h02xkdmjjmz5fr98h24ylcq7jdm3mg1x9hka9cqdvdsdbck1s";
+ rev = "d3aad43b3fcf707052f7dd8a7c7072fa69773f3c";
+ sha256 = "0m84qnm7pxn26a4znf0gxrz2q0kr951lqzk7pph54xdxrcvjha10";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -7988,12 +8108,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2022-05-29";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "acdf27bab79e9c40adbbb25fe4d3ed12a957d008";
- sha256 = "1qhmf34qc9kd1khwr8k57f6x41qyx3avivaz7n3p7aslsnwryz1v";
+ rev = "2256c3e4860f9bddfb539ec4c3faab30535cbb9a";
+ sha256 = "0fcmx1hirf40qdgb76g3bsf6n4s18v3yq4hw4hlwdp4jpbl2zymw";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -8060,12 +8180,12 @@ final: prev:
vim-codefmt = buildVimPluginFrom2Nix {
pname = "vim-codefmt";
- version = "2022-02-09";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "google";
repo = "vim-codefmt";
- rev = "27e5ac299a0714025cc46fc1da11694a8662b058";
- sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7";
+ rev = "b5270ae807fdbad5183f2831a9348f2fb7cfea1d";
+ sha256 = "0fq1dcizdvrnq6faw36206wvvnfzgcpz83a3kpn466hfbbysmn45";
};
meta.homepage = "https://github.com/google/vim-codefmt/";
};
@@ -8252,12 +8372,12 @@ final: prev:
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2022-03-26";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "d6b9957a1e13f34fb66795fad729c611b2513922";
- sha256 = "14a0mbhcw10400g6ybj6h8nq5bis9hba76qvjx5mph7vbb3rhjwn";
+ rev = "c2495b008f1adce6d21745b2c4c576eecc985959";
+ sha256 = "1zj1bab5ck9k9c11cmyszmlnfw3sis79kmlag2a0c0p035rzsl35";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -8696,12 +8816,12 @@ final: prev:
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2022-05-25";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "8cd8d3bcbe8075f1126be151ba01b90b4370734a";
- sha256 = "1nv18sn0nr75b9f9hf4ax1f22srqv2basayy1yz2mc42m0mp8ra2";
+ rev = "875c404da92bb716fdfb33d4948277651ff345a9";
+ sha256 = "0gkbd8vvyiln3v1f0hgx34ixhbqda8ggivqfgpnb7vlx5j9za706";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -8768,12 +8888,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2022-05-29";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "92870eb6d2f9663f34f20537ef0393b5ffeb2291";
- sha256 = "0d60kdp539il0vka0ixayf8cq9xb756bafbnjw1mz725s0h5r927";
+ rev = "5920f807f5a52957a6a09dd36aab1c00bfd85455";
+ sha256 = "1jzlrmc9prv3yhsqjn6bnjhllh7h7vqf6088ady4b2ical1lr839";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -9694,12 +9814,12 @@ final: prev:
vim-markbar = buildVimPluginFrom2Nix {
pname = "vim-markbar";
- version = "2022-05-14";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "Yilin-Yang";
repo = "vim-markbar";
- rev = "7a57b2fb54ee36cbc196674f2929e1c334eb9907";
- sha256 = "02piwnqh1pca7v1h75wn5jr5kh4ik4jj3xmz32b7z8a521wfawa9";
+ rev = "623f7f64f167c32d7dd358c908544609307a1cfb";
+ sha256 = "1yxb9pk12nyvaxjyckbgvfkf4xql6l5yah6gn21pa5j05n8fd7b5";
};
meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
};
@@ -10199,12 +10319,12 @@ final: prev:
vim-pandoc-syntax = buildVimPluginFrom2Nix {
pname = "vim-pandoc-syntax";
- version = "2022-02-16";
+ version = "2022-06-01";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc-syntax";
- rev = "7bea0ba8929749b2a471520af87635163fb28bdf";
- sha256 = "1dqd11qmb5jlkmalp10niysz1c2rv2pzwq332i3incq1v1l5146j";
+ rev = "ff52ed9296715988fc3269b64a903415c3bdf322";
+ sha256 = "08p51a7alj173j0n8qlg4lpyyr4m2i6jfm7wqxl0k4qnfw3lpyx9";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
};
@@ -10703,12 +10823,12 @@ final: prev:
vim-scriptease = buildVimPluginFrom2Nix {
pname = "vim-scriptease";
- version = "2022-05-29";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-scriptease";
- rev = "66da29cf9bf679c4d011b308bd494204dc50d251";
- sha256 = "1zxypaj0396khnj5iw3icr30hsm52lrr9kcgpqp3zwnmxk42chrd";
+ rev = "18511d389675d773994215ddb572ccdc2b72f52b";
+ sha256 = "1mzs4x6y68akysbibprfif1dksaafhcyhddkcyh3da6by6sp5l0l";
};
meta.homepage = "https://github.com/tpope/vim-scriptease/";
};
@@ -11003,12 +11123,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
- version = "2022-03-17";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
- rev = "61f122ebc41e9bcf1793c752a728db59feee77bb";
- sha256 = "1p9b2xgfcfbikadb2250ja0zbz1hcj02knqj5jw5kr3fp170100h";
+ rev = "a8ab56f30c603f8022f5fb6a436f5183beeb7b27";
+ sha256 = "1xlb8q93ff9qdlk17b76sbrz2adixj7zxf8b9ccvafki8diaqkj9";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@@ -11160,12 +11280,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2022-05-24";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "99e2bdd80bc9aeb45eb24e4637dd5d2db05e88fb";
- sha256 = "0vwr2hsfa7ya97501998k28smhx437hclsa5f5zx1j8np1zkspbv";
+ rev = "9bd4cd2d772018087d016fa4d35c45c09f13effd";
+ sha256 = "1bs2q5aw7figwk08b0qahyyzdh1g8gp4vbfzxayxh340qj465f8p";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -11832,12 +11952,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2022-05-19";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "4e03d5ea5c2d7efb8d1f5e73dcc917ad53b0bfb9";
- sha256 = "0501qcy0kx4nd1ny1fb2klp8fpss3j5vvcynhvx3pn9jxj77mpqn";
+ rev = "44eeaebd8cf8514de2b503e8698f2f341b5f23ad";
+ sha256 = "197l41s256z6iyb1pym6h9m4046k7m0jiwlrgfbf60yy2fxka7f3";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -12110,12 +12230,12 @@ final: prev:
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2022-05-29";
+ version = "2022-06-03";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "8e6f37d18d9aff6a04bfd9d6fd8a988bfafa9d0b";
- sha256 = "0nhi40qffzwkkb2a3454i2v8c7fa375lzizylam9ms86d0g9iy7k";
+ rev = "ab81680a4a78c6be800edba547ebf309a477be6e";
+ sha256 = "1dip9ls8m1dvk69kzyb3wkxvkrv48x1lnv8l4l6xzp1d5xdnh5jy";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
@@ -12158,24 +12278,24 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2022-05-29";
+ version = "2022-05-30";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "a40c5d8fe2219df22fe87625169a62c90cab917a";
- sha256 = "0d12dzqary3hbqzdzl2mgnkcgg3g8yn1rcrn94c064bw0mivlhx7";
+ rev = "773d339cbd307fe218cf7b3ea04eac26b345a3b7";
+ sha256 = "005r3nmjd3s0gbf319xwrvighjg391j3qh79sfc2568z53wxj8r0";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
chad = buildVimPluginFrom2Nix {
pname = "chad";
- version = "2022-05-30";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "cf2170bb881eebd62aa3b96c4af18998f77c4138";
- sha256 = "12vl7m4wc3jsqcbaf011bl9y0qd50rxylli8b1k75zdfwf66f587";
+ rev = "574b9612fa8e91b2d6a5fed538b30cc5dc74098e";
+ sha256 = "0hwji2mlf7awm303kxyy5b9hgz8kya38paqpw5l04g5b8a7qzwss";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -12242,12 +12362,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
- version = "2022-05-14";
+ version = "2022-06-02";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
- rev = "3a6bcc2706409e08280354925006e8a8a01620cb";
- sha256 = "1l796ap9lsgk5bhy9g72m5nmficbigrfa5rix90dn6mam37jhc8s";
+ rev = "04fb9d3bf29755a0cd6e53373e5750ca78a8d37c";
+ sha256 = "14zdlm3rpfkkg0y94071i6qx4bk3vp2wd2f5v7503mdc3p684amq";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5a88140eba3a..0749ec1dc092 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -8,6 +8,7 @@ https://github.com/vim-scripts/DoxygenToolkit.vim/,,
https://github.com/numToStr/FTerm.nvim/,,
https://github.com/antoinemadec/FixCursorHold.nvim/,,
https://github.com/vim-scripts/Improved-AnsiEsc/,,
+https://github.com/ionide/Ionide-vim/,HEAD,
https://github.com/martinda/Jenkinsfile-vim-syntax/,,
https://github.com/autozimu/LanguageClient-neovim/,,
https://github.com/vigoux/LanguageTool.nvim/,,
@@ -85,6 +86,7 @@ https://github.com/sudormrfbin/cheatsheet.nvim/,,
https://github.com/yunlingz/ci_dark/,,
https://github.com/projekt0n/circles.nvim/,,
https://github.com/xavierd/clang_complete/,,
+https://github.com/p00f/clangd_extensions.nvim/,HEAD,
https://github.com/rhysd/clever-f.vim/,,
https://github.com/bbchung/clighter8/,,
https://github.com/winston0410/cmd-parser.nvim/,,
@@ -121,6 +123,7 @@ https://github.com/manicmaniac/coconut.vim/,HEAD,
https://github.com/metakirby5/codi.vim/,,
https://github.com/tjdevries/colorbuddy.nvim/,,
https://github.com/lilydjwg/colorizer/,,
+https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
https://github.com/wincent/command-t/,,
https://github.com/numtostr/comment.nvim/,,
https://github.com/rhysd/committia.vim/,,
@@ -137,12 +140,15 @@ https://github.com/rhysd/conflict-marker.vim/,,
https://github.com/Olical/conjure/,,
https://github.com/Shougo/context_filetype.vim/,,
https://github.com/github/copilot.vim/,,
+https://github.com/ms-jpq/coq.artifacts/,HEAD,
+https://github.com/ms-jpq/coq.thirdparty/,HEAD,
https://github.com/jvoorhis/coq.vim/,,
https://github.com/ms-jpq/coq_nvim/,,
https://github.com/lfilho/cosco.vim/,,
https://github.com/nixprime/cpsm/,,
https://github.com/saecki/crates.nvim/,,
https://github.com/godlygeek/csapprox/,,
+https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
https://github.com/chrisbra/csv.vim/,,
https://github.com/JazzCore/ctrlp-cmatcher/,,
https://github.com/FelikZ/ctrlp-py-matcher/,,
@@ -207,6 +213,7 @@ https://github.com/andviro/flake8-vim/,,
https://github.com/ncm2/float-preview.nvim/,,
https://github.com/fhill2/floating.nvim/,,
https://github.com/floobits/floobits-neovim/,,
+https://github.com/akinsho/flutter-tools.nvim/,HEAD,
https://github.com/mhartington/formatter.nvim/,,
https://github.com/megaannum/forms/,,
https://github.com/rafamadriz/friendly-snippets/,,
@@ -237,6 +244,7 @@ https://github.com/roman/golden-ratio/,,
https://github.com/buoto/gotests-vim/,,
https://github.com/rmagatti/goto-preview/,,
https://github.com/junegunn/goyo.vim/,,
+https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
https://github.com/liuchengxu/graphviz.vim/,,
https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
https://github.com/morhetz/gruvbox/,,
@@ -451,6 +459,7 @@ https://github.com/neovim/nvimdev.nvim/,,
https://github.com/glepnir/oceanic-material/,,
https://github.com/mhartington/oceanic-next/,,
https://github.com/pwntester/octo.nvim/,,
+https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
https://github.com/Th3Whit3Wolf/one-nvim/,,
https://github.com/navarasu/onedark.nvim/,,
https://github.com/joshdick/onedark.vim/,,
@@ -527,6 +536,7 @@ https://github.com/liuchengxu/space-vim/,,
https://github.com/ctjhoa/spacevim/,,
https://github.com/chrisgeo/sparkup/,,
https://github.com/edluffy/specs.nvim/,,
+https://github.com/lewis6991/spellsitter.nvim/,HEAD,
https://github.com/sjl/splice.vim/,,
https://github.com/vimlab/split-term.vim/,,
https://github.com/AndrewRadev/splitjoin.vim/,,
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 063c5cc1551c..4aea1c4d9813 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
- version = "5.0.2";
+ version = "5.0.6";
kde-channel = "stable";
- sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8=";
+ sha256 = "sha256:0qhf7vm13v33yk67n7wdcgrqpk7yvajdlkqcp7zhrl2z7qdnvmzd";
})
diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix
index a0819a203e72..825e8882a557 100644
--- a/pkgs/applications/graphics/krita/generic.nix
+++ b/pkgs/applications/graphics/krita/generic.nix
@@ -3,7 +3,7 @@
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash, breeze-icons
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
-, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
+, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp
, qtmultimedia, qtx11extras, quazip
, python3Packages
@@ -23,13 +23,13 @@ mkDerivation rec {
inherit sha256;
};
- nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
+ nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
- openjpeg opencolorio_1 poppler curl ilmbase
+ openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp
qtmultimedia qtx11extras quazip
python3Packages.pyqt5
] ++ lib.optional stdenv.hostPlatform.isx86 vc;
@@ -37,6 +37,17 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
+ # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script.
+ # Patch the PYTHONPATH so python scripts can import sip successfully.
+ postPatch = let
+ pythonPath = python3Packages.makePythonPath (with python3Packages; [ sip setuptools ]);
+ in ''
+ substituteInPlace cmake/modules/FindSIP.cmake \
+ --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}'
+ substituteInPlace cmake/modules/SIPMacros.cmake \
+ --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}'
+ '';
+
cmakeFlags = [
"-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
"-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
@@ -52,7 +63,7 @@ mkDerivation rec {
meta = with lib; {
description = "A free and open source painting application";
homepage = "https://krita.org/";
- maintainers = with maintainers; [ abbradar ];
+ maintainers = with maintainers; [ abbradar sifmelcara ];
platforms = platforms.linux;
license = licenses.gpl3Only;
};
diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix
new file mode 100644
index 000000000000..9039854f74e3
--- /dev/null
+++ b/pkgs/applications/misc/sticky/default.nix
@@ -0,0 +1,83 @@
+{ lib
+, python3
+, fetchFromGitHub
+, wrapGAppsHook
+, cinnamon
+, glib
+, gspell
+, gtk3
+, gobject-introspection
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "sticky";
+ version = "1.8";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = pname;
+ rev = version;
+ hash = "sha256-VSD/QsG7G9hji5m6NSEkCoVM+XK3t4KmCqbocTbZwE4=";
+ };
+
+ postPatch = ''
+ sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py
+ '';
+
+ nativeBuildInputs = [
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gobject-introspection
+ cinnamon.xapps
+ gspell
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pygobject3
+ xapp
+ ];
+
+ postBuild = ''
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ '';
+
+ # hook for gobject-introspection doesn't like strictDeps
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
+ # no tests
+ doCheck = false;
+
+ dontWrapGApps = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ mv usr/lib $out
+ mv usr/share $out
+ patchShebangs $out/lib/sticky
+ mv $out/lib/sticky/sticky.py $out/bin/sticky
+ sed -i -e "1aimport sys;sys.path.append('$out/lib/sticky')" $out/bin/sticky
+
+ runHook postInstall
+ '';
+
+ # Arguments to be passed to `makeWrapper`, only used by buildPython*
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ meta = with lib; {
+ description = "A sticky notes app for the linux desktop";
+ homepage = "https://github.com/linuxmint/sticky";
+ license = licenses.gpl2Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ linsui ];
+ };
+}
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 32b785c5cfb2..2555de205296 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.3.14";
+ version = "3.3.15";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-v52QVyd2Rl1nixKD1TY1YQaSPKRsbw4BCtfRly9aMrM=";
+ hash = "sha256-SNAhuiUO8f92LAdnV9q04xK4yT+AVAS+YAHPPtHdMYI=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 6f5255bf1860..e637881d968c 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -15,6 +15,9 @@ mkDerivation rec {
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
mv bin/chatterino.app "$out/Applications/"
+ '' + ''
+ mkdir -p $out/share/icons/hicolor/256x256/apps
+ cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png
'';
meta = with lib; {
description = "A chat client for Twitch chat";
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
index aeb7677a10ee..8e1ce52c266e 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "deltachat-cursed";
- version = "0.6.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "adbenitez";
repo = "deltachat-cursed";
rev = "v${version}";
- hash = "sha256-qFX5CjrF0HLR41BbrCPT+rI9vAP6VLzXXAaVq/Loabs=";
+ hash = "sha256-EA3yTP4j/jj26E8zdRwTIW+9FkI0ehK4Y8AqiCnF2xA=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index a8842b14a6de..94ffd40364c0 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -81,7 +81,7 @@ in nodePackages.deltachat-desktop.override rec {
postInstall = ''
rm -r node_modules/deltachat-node/node/prebuilds
- npm run build
+ npm run build4production
npm prune --production
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 1581790c3d4c..adb457068a03 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -46,11 +46,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.44.1";
+ version = "3.44.2";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "dEx+CK0R4bYQPO60u/2Jo7Yo4SbOOGe7AI80F8wEnqk=";
+ sha256 = "+scGznpXP42WdzfxWtDr66Q6h/48p1f4VBID2ZG+BjM=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
deleted file mode 100644
index c223fa40cc4b..000000000000
--- a/pkgs/applications/office/marp/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ lib, stdenv, fetchurl, atomEnv, libXScrnSaver, gtk2 }:
-
-stdenv.mkDerivation rec {
- pname = "marp";
- version = "0.0.14";
-
- src = fetchurl {
- url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
- sha256 = "0nklzxwdx5llzfwz1hl2jpp2kwz78w4y63h5l00fh6fv6zisw6j4";
- };
-
- unpackPhase = ''
- mkdir {locales,resources}
- tar --delay-directory-restore -xf $src
- chmod u+x {locales,resources}
- '';
-
- installPhase = ''
- mkdir -p $out/lib/marp $out/bin
- cp -r ./* $out/lib/marp
- ln -s $out/lib/marp/Marp $out/bin
- '';
-
- postFixup = ''
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libXScrnSaver gtk2 ]}:$out/lib/marp" \
- $out/bin/Marp
- '';
-
- meta = with lib; {
- description = "Markdown presentation writer, powered by Electron";
- homepage = "https://yhatt.github.io/marp/";
- license = licenses.mit;
- maintainers = [ maintainers.puffnfresh ];
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index 5115f37891ab..ca312188987e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
@@ -1,28 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }:
rustPlatform.buildRustPackage rec {
pname = "git-absorb";
- version = "0.6.6";
+ version = "0.6.7";
src = fetchFromGitHub {
- owner = "tummychow";
- repo = pname;
- rev = "refs/tags/${version}";
- sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9";
+ owner = "tummychow";
+ repo = pname;
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-qhUw1wjXn1tyiH175+BadcoKoZ0wHxpMTKDIKOcJjQ0=";
};
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "0dax6wkbyk5p8p0mm406vfgmqfmfxzyzqps6yk8fachi61x12ja6";
+ cargoSha256 = "sha256-Wh2kA12CggbgdofWJwPAy+587qfMUPSy9nQmO11+keY=";
postInstall = ''
installManPage Documentation/git-absorb.1
- for shell in bash zsh fish; do
- $out/bin/git-absorb --gen-completions $shell > git-absorb.$shell
- installShellCompletion git-absorb.$shell
- done
+ installShellCompletion --cmd git-absorb \
+ --bash <($out/bin/git-absorb --gen-completions bash) \
+ --fish <($out/bin/git-absorb --gen-completions fish) \
+ --zsh <($out/bin/git-absorb --gen-completions zsh)
'';
meta = with lib; {
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 40d678bf7bbe..5b3a10786fe9 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "15.0.0",
- "repo_hash": "sha256-+ZLHo35BhgWlopuwrVGiMvcWl8qUvHUV2kAEIXWazyY=",
+ "version": "15.0.1",
+ "repo_hash": "sha256-GMdR8drmnLR5KH/N0iyLmPi2sggeQX7PT2KP3QO5+/Y=",
"yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v15.0.0-ee",
+ "rev": "v15.0.1-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "15.0.0",
+ "GITALY_SERVER_VERSION": "15.0.1",
"GITLAB_PAGES_VERSION": "1.58.0",
"GITLAB_SHELL_VERSION": "14.3.0",
- "GITLAB_WORKHORSE_VERSION": "15.0.0"
+ "GITLAB_WORKHORSE_VERSION": "15.0.1"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index aa53fc5171c3..afaf446c10f9 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
- version = "15.0.0";
+ version = "15.0.1";
package_version = "v14";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
in
@@ -24,7 +24,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-ib/gGkXo6W6LZ6j92oUMhJWdDYZRnA1p+tsOK6ewemk=";
+ sha256 = "sha256-pNVeXB2A8jYUVir6t8jz6ifBksWucZjUn6RIszXdwJY=";
};
vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index d67e8bf4d445..26ab78bd27d6 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "15.0.0";
+ version = "15.0.1";
src = fetchFromGitLab {
owner = data.owner;
diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix
index 96fa856f1ed6..4b756bb720a0 100644
--- a/pkgs/applications/virtualization/colima/default.nix
+++ b/pkgs/applications/virtualization/colima/default.nix
@@ -1,20 +1,20 @@
{ lib
-, buildGoModule
+, buildGo118Module
, fetchFromGitHub
, installShellFiles
, lima
, makeWrapper
}:
-buildGoModule rec {
+buildGo118Module rec {
pname = "colima";
- version = "0.3.4";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "abiosoft";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-KYW3gxf21aWnuRHkysOjArzMSNH3m3XDoi6Sic3N+Po=";
+ sha256 = "sha256-66nKH5jxTzLB9bg2lH1E8Cc0GZ6C/N/+yPYhCVEKOBY=";
# We need the git revision
leaveDotGit = true;
@@ -26,7 +26,9 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles makeWrapper ];
- vendorSha256 = "sha256-Z4+qwoX04VnLsUIYRfOowFLgcaA9w8oGRl77jzFigIc=";
+ vendorSha256 = "sha256-91Ex3RPWxOHyZcR3Bo+bRdDAFw2mEGiC/uNKjdX2kuw=";
+
+ doCheck = false;
preConfigure = ''
ldflags="-X github.com/abiosoft/colima/config.appVersion=${version}
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index c1302ac2de49..29be2112896b 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "containerd";
- version = "1.6.4";
+ version = "1.6.5";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";
+ sha256 = "sha256-WEHhx9xSxzBoViujGc4yNt9K2gSMfU6GFmsYk3WDfu8=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index dbf4bb734d84..09c8de64f280 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -1,15 +1,9 @@
-{ lib
-, buildGoPackage
-, fetchFromGitHub
-, makeWrapper
-}:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "docker-slim";
version = "1.37.6";
- goPackagePath = "github.com/docker-slim/docker-slim";
-
src = fetchFromGitHub {
owner = "docker-slim";
repo = "docker-slim";
@@ -17,16 +11,17 @@ buildGoPackage rec {
sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4=";
};
+ vendorSha256 = null;
+
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
- nativeBuildInputs = [
- makeWrapper
- ];
+ nativeBuildInputs = [ makeWrapper ];
ldflags = [
- "-s" "-w"
- "-X ${goPackagePath}/pkg/version.appVersionTag=${version}"
- "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}"
+ "-s"
+ "-w"
+ "-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}"
+ "-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}"
];
# docker-slim tries to create its state dir next to the binary (inside the nix
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index a89876aeaabf..642c4b1390f4 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -23,14 +23,14 @@ let
buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
- version = "6.1.30";
+ version = "6.1.34";
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef";
+ sha256 = "9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49";
};
outputs = [ "out" "modsrc" ];
@@ -97,6 +97,11 @@ in stdenv.mkDerivation {
./qtx11extras.patch
# https://github.com/NixOS/nixpkgs/issues/123851
./fix-audio-driver-loading.patch
+ # NOTE: both patches below should be removed when updating to 6.1.35
+ # https://www.virtualbox.org/ticket/20914#comment:6
+ ./linux518.patch
+ # https://www.virtualbox.org/ticket/20904#comment:22
+ ./ffreestanding.patch
];
postPatch = ''
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index dd1adcd77294..24e66ef7c753 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -12,7 +12,7 @@ fetchurl rec {
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
- let value = "a5ee3e693a0470a77735556a77a09aa83bfc48181998b9b21b1af82ef1d11c2a";
+ let value = "d7856f0688b6d2ed1e8bff0b367efa952068b03fa5a3a29b46db08cfd5d9a810";
in assert (builtins.stringLength value) == 64; value;
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/ffreestanding.patch b/pkgs/applications/virtualization/virtualbox/ffreestanding.patch
new file mode 100644
index 000000000000..0e22aa60cde4
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/ffreestanding.patch
@@ -0,0 +1,20 @@
+diff --git a/Config.kmk b/Config.kmk
+index 3df197404..4c6bd76bb 100644
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -4503,11 +4504,14 @@ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
++ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+ $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+ -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
++ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
++TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding
++ endif
+ TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index fc37456919d0..9c012750bf10 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "d324d2d09d8dd00b1eb3ef3d80ab2e1726998421d13adc0d2a90e05d355aaa5c";
+ sha256 = "88f86fa0e6970b6a7c80d714b7a91a8c425ff8ef53a3e73fc80781191a87257b";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
diff --git a/pkgs/applications/virtualization/virtualbox/linux518.patch b/pkgs/applications/virtualization/virtualbox/linux518.patch
new file mode 100644
index 000000000000..6130cfc78a0a
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/linux518.patch
@@ -0,0 +1,285 @@
+Index: include/VBox/sup.h
+===================================================================
+--- trunk/include/VBox/sup.h (revision 151556)
++++ trunk/include/VBox/sup.h (working copy)
+@@ -2142,6 +2142,26 @@
+ */
+ SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void);
+
++/**
++ * Notification from R0 VMM prior to loading the guest-FPU register state.
++ *
++ * @returns Whether the host-FPU register state has been saved by the host kernel.
++ * @param fCtxHook Whether thread-context hooks are enabled.
++ *
++ * @remarks Called with preemption disabled.
++ */
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook);
++
++/**
++ * Notification from R0 VMM prior to saving the guest-FPU register state (and
++ * potentially restoring the host-FPU register state) in ring-0.
++ *
++ * @param fCtxHook Whether thread-context hooks are enabled.
++ *
++ * @remarks Called with preemption disabled.
++ */
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook);
++
+ /** @copydoc RTLogGetDefaultInstanceEx
+ * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */
+ SUPR0DECL(struct RTLOGGER *) SUPR0GetDefaultLogInstanceEx(uint32_t fFlagsAndGroup);
+Index: src/VBox/Additions/linux/sharedfolders/regops.c
+===================================================================
+--- trunk/src/VBox/Additions/linux/sharedfolders/regops.c (revision 151556)
++++ trunk/src/VBox/Additions/linux/sharedfolders/regops.c (working copy)
+@@ -3823,7 +3823,9 @@
+ .readpage = vbsf_readpage,
+ .writepage = vbsf_writepage,
+ /** @todo Need .writepages if we want msync performance... */
+-#if RTLNX_VER_MIN(2,5,12)
++#if RTLNX_VER_MIN(5,18,0)
++ .dirty_folio = filemap_dirty_folio,
++#elif RTLNX_VER_MIN(2,5,12)
+ .set_page_dirty = __set_page_dirty_buffers,
+ #endif
+ #if RTLNX_VER_MIN(5,14,0)
+Index: src/VBox/Additions
+===================================================================
+--- trunk/src/VBox/Additions (revision 151556)
++++ trunk/src/VBox/Additions (working copy)
+
+Property changes on: src/VBox/Additions
+___________________________________________________________________
+Modified: svn:mergeinfo
+## -0,0 +0,1 ##
+ Merged /trunk/src/VBox/Additions:r150844
+Index: src/VBox/HostDrivers/Support/SUPDrv.cpp
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (working copy)
+@@ -98,6 +98,18 @@
+ # endif
+ #endif
+
++#if defined(RT_OS_LINUX) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
++/* In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks
++ * before triggering __underlying_memcpy() call. We do not pass these checks here,
++ * so bypass them for now. */
++# if RTLNX_VER_MIN(5,18,0)
++# define SUPDRV_MEMCPY __underlying_memcpy
++# else
++# define SUPDRV_MEMCPY memcpy
++# endif
++#else
++# define SUPDRV_MEMCPY memcpy
++#endif
+
+ /*
+ * Logging assignments:
+@@ -266,6 +278,8 @@
+ SUPEXP_STK_BACK( 2, SUPR0ContFree),
+ SUPEXP_STK_BACK( 2, SUPR0ChangeCR4),
+ SUPEXP_STK_BACK( 1, SUPR0EnableVTx),
++ SUPEXP_STK_OKAY( 1, SUPR0FpuBegin),
++ SUPEXP_STK_OKAY( 1, SUPR0FpuEnd),
+ SUPEXP_STK_BACK( 0, SUPR0SuspendVTxOnCpu),
+ SUPEXP_STK_BACK( 1, SUPR0ResumeVTxOnCpu),
+ SUPEXP_STK_OKAY( 1, SUPR0GetCurrentGdtRw),
+@@ -1742,7 +1756,7 @@
+
+ /* execute */
+ pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
+- memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
++ SUPDRV_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
+ pReq->Hdr.rc = VINF_SUCCESS;
+ return 0;
+ }
+Index: src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (working copy)
+@@ -2002,6 +2002,18 @@
+ }
+
+
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++ return false;
++}
++
++
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++}
++
+ /*
+ *
+ * org_virtualbox_SupDrv
+Index: src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c (working copy)
+@@ -640,3 +640,16 @@
+ return 0;
+ }
+
++
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++ return false;
++}
++
++
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++}
++
+Index: src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (working copy)
+@@ -1454,6 +1454,31 @@
+ }
+
+
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++#if RTLNX_VER_MIN(5,18,0)
++ kernel_fpu_begin();
++ /* if (fCtxHook) */
++ preempt_enable(); /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */
++ return true;
++#else
++ return false;
++#endif
++}
++
++
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++#if RTLNX_VER_MIN(5,18,0)
++ /* if (fCtxHook) */
++ preempt_disable(); /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */
++ kernel_fpu_end();
++#endif
++}
++
++
+ int VBOXCALL supdrvOSGetCurrentGdtRw(RTHCUINTPTR *pGdtRw)
+ {
+ #if RTLNX_VER_MIN(4,12,0)
+Index: src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp (working copy)
+@@ -541,3 +541,16 @@
+ return 0;
+ }
+
++
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++ return false;
++}
++
++
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++}
++
+Index: src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (working copy)
+@@ -1309,3 +1309,16 @@
+ return 0;
+ }
+
++
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++ return false;
++}
++
++
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++}
++
+Index: src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (revision 151556)
++++ trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (working copy)
+@@ -2704,6 +2704,19 @@
+ }
+
+
++SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++ return false;
++}
++
++
++SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
++{
++ RT_NOREF(fCtxHook);
++}
++
++
+ SUPR0DECL(int) SUPR0IoCtlSetupForHandle(PSUPDRVSESSION pSession, intptr_t hHandle, uint32_t fFlags, PSUPR0IOCTLCTX *ppCtx)
+ {
+ /*
+Index: src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (revision 151556)
++++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (working copy)
+@@ -2311,7 +2311,13 @@
+ vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
+ Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
+ Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
++#if RTLNX_VER_MIN(5,18,0)
++ local_bh_disable();
++ err = netif_rx(pBuf);
++ local_bh_enable();
++#else
+ err = netif_rx_ni(pBuf);
++#endif
+ if (err)
+ rc = RTErrConvertFromErrno(err);
+ }
+Index: src/VBox/VMM/VMMR0/CPUMR0.cpp
+===================================================================
+--- trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp (revision 151556)
++++ trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp (working copy)
+@@ -440,6 +440,9 @@
+ Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST));
+ Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE));
+
++ /* Notify the support driver prior to loading the guest-FPU register state. */
++ SUPR0FpuBegin(false /* unused */);
++
+ if (!pVM->cpum.s.HostFeatures.fLeakyFxSR)
+ {
+ Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE));
+@@ -484,6 +487,9 @@
+ Assert(ASMGetCR4() & X86_CR4_OSFXSR);
+ if (pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST))
+ {
++ /* Notify the support driver prior to loading the host-FPU register state. */
++ SUPR0FpuEnd(false /* unused */);
++
+ fSavedGuest = RT_BOOL(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST);
+ if (!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE))
+ cpumR0SaveGuestRestoreHostFPUState(&pVCpu->cpum.s);
diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
deleted file mode 100644
index a837c435204a..000000000000
--- a/pkgs/applications/window-managers/btops/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- pname = "btops";
- version = "0.1.0";
-
- goPackagePath = "github.com/cmschuetz/btops";
-
- src = fetchFromGitHub {
- owner = "cmschuetz";
- repo = "btops";
- rev = version;
- sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY=";
- };
-
- goDeps = ./deps.nix;
-
- meta = with lib; {
- description = "bspwm desktop management that supports dymanic appending, removing, and renaming";
- homepage = "https://github.com/cmschuetz/btops";
- maintainers = with maintainers; [ mnacamura ];
- license = licenses.mit;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/btops/deps.nix b/pkgs/applications/window-managers/btops/deps.nix
deleted file mode 100644
index a893d40e2107..000000000000
--- a/pkgs/applications/window-managers/btops/deps.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
- sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c2353362d570a7bfa228149c62842019201cfb71";
- sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/mapstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
- sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
- sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "63644898a8da0bc22138abf860edaf5277b6102e";
- sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
- sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
- sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/viper";
- rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
- sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
- sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
- sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix
index 3403660b1e8f..973df59e408b 100644
--- a/pkgs/data/fonts/font-awesome/default.nix
+++ b/pkgs/data/fonts/font-awesome/default.nix
@@ -9,8 +9,10 @@ let
inherit rev;
postFetch = ''
- tar xf $downloadedFile --strip=1
- install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
+ install -m444 -Dt $out/share/fonts/opentype $out/{fonts,otfs}/*.otf
+ shopt -s extglob dotglob
+ rm -rf $out/!(share)
+ shopt -u extglob dotglob
'';
inherit sha256;
@@ -38,7 +40,7 @@ in
v4 = font-awesome {
version = "4.7.0";
rev = "v4.7.0";
- sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
+ sha256 = "sha256-qdrIwxAB+z+4PXrKrj6bBuiJY0DYQuHm2DRng5sYEck=";
};
v5 = font-awesome {
version = "5.15.3";
@@ -46,6 +48,6 @@ in
};
v6 = font-awesome {
version = "6.1.1";
- sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA";
+ sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA=";
};
}
diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index d9cfadd5f088..c3def549aa43 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -5,11 +5,12 @@ in {
osdnRelease = fetchzip {
name = "${pname}-osdn";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz";
- sha256 = "16jirhkjs46ac8cdk2w4xkpv989gmz7i8gnrq9bck13rbil7wlzr";
+ sha256 = "sha256-+VN+aFx5hMlWwtk+FM+vL6G07+yEi9kYYsoQLSfMUZo=";
postFetch = ''
- mkdir -p $out/share/fonts/truetype/${pname}
- tar xvJf $downloadedFile
- mv */*.ttf $out/share/fonts/truetype/${pname}
+ install -m444 -Dt $out/share/fonts/truetype/${pname} $out/*.ttf
+ shopt -s extglob dotglob
+ rm -rf $out/!(share)
+ shopt -u extglob dotglob
'';
meta = with lib; {
@@ -26,12 +27,14 @@ in {
owner = "coz-m";
repo = "MPLUS_FONTS";
rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932";
- sha256 = "1ha92hyzcfbbq682c50k8clbhigc09rcb9mxjzjwqfj9rfp348id";
+ sha256 = "sha256-LSIyrstJOszll72mxXIC7EW4KEMTFCaQwWs59j0UScE=";
postFetch = ''
mkdir -p $out/share/fonts/{truetype,opentype}/${pname}
- tar xvzf $downloadedFile
- mv */fonts/ttf/* $out/share/fonts/truetype/${pname}
- mv */fonts/otf/* $out/share/fonts/opentype/${pname}
+ mv $out/fonts/ttf/* $out/share/fonts/truetype/${pname}
+ mv $out/fonts/otf/* $out/share/fonts/opentype/${pname}
+ shopt -s extglob dotglob
+ rm -rf $out/!(share)
+ shopt -u extglob dotglob
'';
meta = with lib; {
diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix
index 8eb3c9951f3c..c09fb5450f3f 100644
--- a/pkgs/desktops/gnome/core/rygel/default.nix
+++ b/pkgs/desktops/gnome/core/rygel/default.nix
@@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "rygel";
- version = "0.40.3";
+ version = "0.40.4";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "zwvjUQnLVw5c8K/lltha7Lmw6TWYYVNTArt7YE2vUdc=";
+ sha256 = "c22K2+hhX2y8j8//mEXcmF/RDhZinaI2tLUtvt8KNIs=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 31dfa369818f..5a6f630fe45d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -1,12 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
-, appstream
-, desktop-file-utils
-, gettext
-, libxml2
, meson
, ninja
, pkg-config
@@ -24,29 +19,16 @@
stdenv.mkDerivation rec {
pname = "elementary-camera";
- version = "6.0.3";
+ version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "camera";
rev = version;
- sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w=";
+ sha256 = "sha256-uccH9rCZaifIlLDx+zat3Zx8ecgKo2M6x+mg7AnuFBs=";
};
- patches = [
- # Fix build with meson 0.61
- # https://github.com/elementary/camera/pull/216
- (fetchpatch {
- url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch";
- sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4=";
- })
- ];
-
nativeBuildInputs = [
- appstream
- desktop-file-utils
- gettext
- libxml2
meson
ninja
pkg-config
diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix
index 7f93a0562a4e..e16049e8594b 100644
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@@ -86,7 +86,6 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
- broken = stdenv.isDarwin;
description = builtins.getAttr type descriptions;
homepage = "https://dotnet.github.io/";
license = licenses.mit;
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index ff243372b4a5..7a01486e2dd9 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -92,7 +92,10 @@ in makePackage {
'';
# glib-2.62 deprecations
- NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
+ # -fcommon: gstreamer workaround for -fno-common toolchains:
+ # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
+ # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
+ NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon";
stripDebugList = [ "." ];
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index 3feda519b084..74f83fdabf1a 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -31,8 +31,15 @@ let
JDK_HOME = ${openjdk11_headless.home}
'' + args.gradleProperties or "");
- #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
- NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+ NIX_CFLAGS_COMPILE = [
+ #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
+ "-DGLIB_DISABLE_DEPRECATION_WARNINGS"
+
+ # gstreamer workaround for -fno-common toolchains:
+ # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
+ # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
+ "-fcommon"
+ ];
buildPhase = ''
runHook preBuild
@@ -89,7 +96,10 @@ in makePackage {
'';
# glib-2.62 deprecations
- NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
+ # -fcommon: gstreamer workaround for -fno-common toolchains:
+ # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
+ # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
+ NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon";
stripDebugList = [ "." ];
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index 61fe3175681e..a8915e92e58a 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
- version = "1.84.0";
+ version = "1.85.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
- hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA=";
+ hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8=";
};
patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs=";
+ hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/development/libraries/libimobiledevice-glue/default.nix
new file mode 100644
index 000000000000..21daddb7ba3d
--- /dev/null
+++ b/pkgs/development/libraries/libimobiledevice-glue/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libplist
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libimobiledevice-glue";
+ version = "0.pre+date=2022-05-22";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchFromGitHub {
+ owner = "libimobiledevice";
+ repo = pname;
+ rev = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb";
+ hash = "sha256-BAdpJK6/iUKCNYLaCJQo0VK63AdIafO8wGbNhnvEc/o=";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ propagatedBuildInputs = [
+ libplist
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/libimobiledevice/libimobiledevice-glue";
+ description = "Library with common code used by the libraries and tools around the libimobiledevice project.";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 94fce176127c..8ded220678d0 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -2,45 +2,52 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
-, libtool
, pkg-config
, gnutls
, libgcrypt
-, libtasn1
-, glib
, libplist
+, libtasn1
, libusbmuxd
+, libimobiledevice-glue
+, SystemConfiguration
+, CoreFoundation
}:
stdenv.mkDerivation rec {
pname = "libimobiledevice";
- version = "unstable-2021-06-02";
-
- src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "ca324155f8b33babf907704828c7903608db0aa2";
- sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I=";
- };
+ version = "1.3.0+date=2022-05-22";
outputs = [ "out" "dev" ];
+ src = fetchFromGitHub {
+ owner = "libimobiledevice";
+ repo = pname;
+ rev = "12394bc7be588be83c352d7441102072a89dd193";
+ hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM=";
+ };
+
+ postPatch = ''
+ echo '${version}' > .tarball-version
+ '';
+
nativeBuildInputs = [
autoreconfHook
- libtool
pkg-config
];
propagatedBuildInputs = [
- glib
gnutls
libgcrypt
libplist
libtasn1
libusbmuxd
+ libimobiledevice-glue
+ ] ++ lib.optionals stdenv.isDarwin [
+ SystemConfiguration
+ CoreFoundation
];
- configureFlags = [ "--disable-openssl" "--without-cython" ];
+ configureFlags = [ "--with-gnutls" "--without-cython" ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/libimobiledevice";
@@ -58,7 +65,7 @@ stdenv.mkDerivation rec {
devices to the Linux Desktop.
'';
license = licenses.lgpl21Plus;
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
maintainers = with maintainers; [ infinisil ];
};
}
diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix
index c10d46577ff6..1de958dfb3a5 100644
--- a/pkgs/development/libraries/libirecovery/default.nix
+++ b/pkgs/development/libraries/libirecovery/default.nix
@@ -1,35 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
, libusb1
, readline
+, libimobiledevice-glue
}:
stdenv.mkDerivation rec {
pname = "libirecovery";
- version = "1.0.0";
+ version = "1.0.0+date=2022-04-04";
+
+ outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "0p9ncqnz5kb7qisw00ynvasw1hax5qx241h9nwppi2g544i9lbnr";
+ rev = "82d235703044c5af9da8ad8f77351fd2046dac47";
+ hash = "sha256-OESN9qme+TlSt+ZMbR4F3z/3RN0I12R7fcSyURBqUVk=";
};
- outputs = [ "out" "dev" ];
-
nativeBuildInputs = [
- autoconf
- automake
- libtool
+ autoreconfHook
pkg-config
];
buildInputs = [
libusb1
readline
+ libimobiledevice-glue
];
- preConfigure = "NOCONFIGURE=1 ./autogen.sh";
-
# Packager note: Not clear whether this needs a NixOS configuration,
# as only the `idevicerestore` binary was tested so far (which worked
# without further configuration).
@@ -46,10 +48,9 @@ stdenv.mkDerivation rec {
provided.
'';
homepage = "https://github.com/libimobiledevice/libirecovery";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Only;
maintainers = with maintainers; [ nh2 ];
mainProgram = "irecovery";
- # Upstream description says it works on more platforms, but packager hasn't tried that yet
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index cac4299f2890..23b1fabce78b 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,34 +1,46 @@
-{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+
+, enablePython ? false
+, python3
+}:
stdenv.mkDerivation rec {
pname = "libplist";
- version = "2.2.0";
+ version = "2.2.0+date=2022-04-05";
+
+ outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6";
+ rev = "db93bae96d64140230ad050061632531644c46ad";
+ hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo=";
};
- outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py";
+ postPatch = ''
+ echo '${version}' > .tarball-version
+ '';
nativeBuildInputs = [
- pkg-config
autoreconfHook
- ] ++ lib.optionals enablePython [
- python
- python.pkgs.cython
+ pkg-config
+ ];
+
+ buildInputs = lib.optionals enablePython [
+ python3
+ python3.pkgs.cython
];
configureFlags = lib.optionals (!enablePython) [
"--without-cython"
];
- propagatedBuildInputs = [ glib ];
-
postFixup = lib.optionalString enablePython ''
- moveToOutput "lib/${python.libPrefix}" "$py"
+ moveToOutput "lib/${python3.libPrefix}" "$py"
'';
meta = with lib; {
@@ -36,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/libimobiledevice/libplist";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ infinisil ];
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix
index 9a07cbf1aa1a..dba098b4468a 100644
--- a/pkgs/development/libraries/libspng/default.nix
+++ b/pkgs/development/libraries/libspng/default.nix
@@ -49,8 +49,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Simple, modern libpng alternative";
- homepage = "https://github.com/randy408/libspng";
+ homepage = "https://libspng.org/";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ humancalico ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index 7bba6e8b4040..28cbd8d8561c 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -1,24 +1,42 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libplist }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libplist
+, libimobiledevice-glue
+}:
stdenv.mkDerivation rec {
pname = "libusbmuxd";
- version = "unstable-2021-02-06";
+ version = "2.0.2+date=2022-05-04";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = "3eb50a07bad4c2222e76df93b23a0161922150d1";
- sha256 = "sha256-pBPBgE6s8JYKJYEV8CcumNki+6jD5r7HzQ0nZ8yQLdM=";
+ rev = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a";
+ hash = "sha256-41N5cSLAiPJ9FjdnCQnMvPu9/qhI3Je/M1VmKY+yII4=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ libplist ];
+ postPatch = ''
+ echo '${version}' > .tarball-version
+ '';
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ libplist
+ libimobiledevice-glue
+ ];
meta = with lib; {
description = "A client library to multiplex connections from and to iOS devices";
- homepage = "https://github.com/libimobiledevice/libusbmuxd";
- license = licenses.lgpl21Plus;
- platforms = platforms.linux ++ platforms.darwin;
+ homepage = "https://github.com/libimobiledevice/libusbmuxd";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.unix;
maintainers = with maintainers; [ infinisil ];
};
}
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
index 6a4242189789..fa0f4eadf3dc 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@@ -116,13 +116,6 @@ qtModule rec {
patchShebangs .
)
- # Patch library paths in sources
- sed -i \
- -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
- -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
- -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
- src/core/web_engine_library_info.cpp
-
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
@@ -132,9 +125,11 @@ qtModule rec {
substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \
--replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
+ # Patch library paths in sources
substituteInPlace src/core/web_engine_library_info.cpp \
--replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
- --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\""
+ --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
+ --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
'';
cmakeFlags = [
@@ -232,6 +227,12 @@ qtModule rec {
requiredSystemFeatures = [ "big-parallel" ];
+ postInstall = ''
+ # This is required at runtime
+ mkdir $out/libexec
+ mv $dev/libexec/QtWebEngineProcess $out/libexec
+ '';
+
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "A web engine based on the Chromium web browser";
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index 1a087e323c08..5dd1ed0d1312 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -16,7 +16,7 @@
}:
buildPythonPackage rec {
- version = "5.0.2";
+ version = "5.2.0";
pname = "approvaltests";
format = "setuptools";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "approvals";
repo = "ApprovalTests.Python";
rev = "refs/tags/v${version}";
- sha256 = "sha256-yEzfDbYHGm3Za4+yIk5lIWM4I+5TnqfluZj8OLN9oK0=";
+ sha256 = "sha256-PrO6NC+ARv0o1KHv+ekPwkEi4VpBIj+YjWRrCSFMHI8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix
index 8aad36037a42..3b2963f7d693 100644
--- a/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/pkgs/development/python-modules/aws-adfs/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aws-adfs";
- version = "2.0.5";
+ version = "2.2.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "venth";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-OBxKJN14CuWSq88KxSttpK/Paj2sBHrBVMyP+oPkHys=";
+ hash = "sha256-REJYuOGq22onMj4WcfA7i4/cG99UGZA9D99ESIKY1A8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 34177b1b5c00..6aaabe3c744a 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
, buildPythonPackage
, fetchFromGitHub
, plotly
@@ -54,7 +53,6 @@ buildPythonPackage rec {
pythonImportsCheck = [ "dash" ];
meta = with lib; {
- broken = stdenv.isDarwin;
description = "Python framework for building analytical web applications";
homepage = "https://dash.plot.ly/";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/f90nml/default.nix b/pkgs/development/python-modules/f90nml/default.nix
new file mode 100644
index 000000000000..39aa55542ded
--- /dev/null
+++ b/pkgs/development/python-modules/f90nml/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python, setuptools-scm }:
+
+buildPythonPackage rec {
+ pname = "f90nml";
+ version = "1.4.1";
+
+ src = fetchFromGitHub {
+ owner = "marshallward";
+ repo = pname;
+ rev = "v" + version;
+ sha256 = "sha256-nSpVBAS2VvXIQwYK/qVVzEc13bicAQ+ScXpO4Rn2O+8=";
+ };
+
+ nativeBuildInputs = [ setuptools-scm ];
+
+ checkPhase = ''
+ ${python.interpreter} setup.py test
+ '';
+
+ pythonImportsCheck = [ "f90nml" ];
+
+ meta = with lib; {
+ description = "Python module for working with Fortran Namelists";
+ homepage = "https://f90nml.readthedocs.io";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ loicreynier ];
+ };
+}
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 682092754262..1d2ee112a439 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
- version = "3.8.0";
+ version = "3.9.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
- hash = "sha256-JaAiAAf0zIJDXXl3zb4UE9XpmjZ8KQiEcZJm1ps+efA=";
+ hash = "sha256-Cz4BvtdncHnl53L+5U2gsm9wTNNmAj8ZXjGOk70yKlo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 064d8a8d203b..bcc914a8eb45 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
- version = "0.4.4.4";
+ version = "0.4.4.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "albertogeniola";
repo = "MerossIot";
- rev = version;
- sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-PBf8uHEeHXoYZcFD9KCWg1I5QRAILjVMl3oglWsEsag=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/messagebird/default.nix b/pkgs/development/python-modules/messagebird/default.nix
new file mode 100644
index 000000000000..2b428964655f
--- /dev/null
+++ b/pkgs/development/python-modules/messagebird/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, pyjwt
+, mock
+, python-dateutil
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "messagebird";
+ version = "2.1.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "messagebird";
+ repo = "python-rest-api";
+ rev = version;
+ hash = "sha256-2KVAxdHT5+Ie3ZRxXZhU0hLOtHWjIiJi+ferkYTlSn0=";
+ };
+
+ propagatedBuildInputs = [
+ pyjwt
+ python-dateutil
+ requests
+ ];
+
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "messagebird"
+ ];
+
+ disabledTestPaths = [
+ # ValueError: not enough values to unpack (expected 6, got 0)
+ "tests/test_request_validator.py"
+ ];
+
+ meta = with lib; {
+ description = "Client for MessageBird's REST API";
+ homepage = "https://github.com/messagebird/python-rest-api";
+ license = with licenses; [ bsd2 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index c2f7f1c9df13..89faff436664 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -2,7 +2,6 @@
, buildPythonPackage
, coloredlogs
, fetchFromGitHub
-, fetchpatch
, ghostscript
, img2pdf
, importlib-metadata
@@ -28,7 +27,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
- version = "13.4.6";
+ version = "13.4.7";
src = fetchFromGitHub {
owner = "ocrmypdf";
@@ -40,7 +39,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-Hd9vsw+UEpE7juYSCiHhXtxaC58OtS/Uy20Jdp6QXPA=";
+ hash = "sha256-jCfMCjh8MdH5K76iyJCgtkgPtpxnCxlXlzttTIzINPk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -54,11 +53,6 @@ buildPythonPackage rec {
tesseract = "${lib.getBin tesseract4}/bin/tesseract";
unpaper = "${lib.getBin unpaper}/bin/unpaper";
})
- # https://github.com/ocrmypdf/OCRmyPDF/pull/973
- (fetchpatch {
- url = "https://github.com/ocrmypdf/OCRmyPDF/commit/808b24d59f5b541a335006aa6ea7cdc3c991adc0.patch";
- hash = "sha256-khsH70fWk5fStf94wcRKKX7cCbgD69LtKkngJIqA3+w=";
- })
];
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pykwb/default.nix b/pkgs/development/python-modules/pykwb/default.nix
new file mode 100644
index 000000000000..5de4abd0306d
--- /dev/null
+++ b/pkgs/development/python-modules/pykwb/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyserial
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pykwb";
+ version = "0.0.10";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-mor2TKhq08w4HzaUaspWOMEFwJaAKjXKoNAaoZJqWPQ=";
+ };
+
+ propagatedBuildInputs = [
+ pyserial
+ ];
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pykwb"
+ ];
+
+ meta = with lib; {
+ description = "Library for interacting with KWB Easyfire Pellet Central Heating Units";
+ homepage = "https://github.com/bimbar/pykwb";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pymailgunner/default.nix b/pkgs/development/python-modules/pymailgunner/default.nix
new file mode 100644
index 000000000000..6b1b03cebf34
--- /dev/null
+++ b/pkgs/development/python-modules/pymailgunner/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pymailgunner";
+ version = "1.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "pschmitt";
+ repo = pname;
+ rev = version;
+ hash = "sha256-QKwpW1aeN6OI76Kocow1Zhghq4/fl/cMPexny0MTwQs=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "pymailgunner"
+ ];
+
+ meta = with lib; {
+ description = "Library for interacting with Mailgun e-mail service";
+ homepage = "https://github.com/pschmitt/pymailgunner";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index 724be70163ab..6fe6e016d1cd 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pypck";
- version = "0.7.14";
+ version = "0.7.15";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "alengwenus";
repo = pname;
rev = version;
- sha256 = "sha256-v8eCCbSnAmJUmHSNS+lz8JRhDFrqyxgAkgcZ2bzfOTg=";
+ hash = "sha256-OuM/r9rxIl4niY87cEcbZ73x2ZIQbaPZqbMrQ7hZE/g=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix
index af0fabee7f0b..aa847ea4fdc3 100644
--- a/pkgs/development/python-modules/pysnmplib/default.nix
+++ b/pkgs/development/python-modules/pysnmplib/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysnmplib";
- version = "5.0.16";
+ version = "5.0.17";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "pysnmp";
repo = "pysnmp";
rev = "v${version}";
- hash = "sha256-TmH4lvlgShEbhpBFEpgGJWLR2k1TmT2MhV2bgYWt9vo=";
+ hash = "sha256-RG8EJmNDXRozlFx76c7p4wILwkatHg/eAhVojp807uQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index be333ee9d045..ed8621bcf3f5 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -3,6 +3,7 @@
, aioshutil
, buildPythonPackage
, fetchFromGitHub
+, ipython
, packaging
, pillow
, poetry-core
@@ -17,12 +18,13 @@
, python-dotenv
, pythonOlder
, pytz
+, termcolor
, typer
}:
buildPythonPackage rec {
pname = "pyunifiprotect";
- version = "3.7.0";
+ version = "3.8.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -30,8 +32,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "briis";
repo = pname;
- rev = "v${version}";
- hash = "sha256-0adbUKTkbgA4pKrIVFGowD4Wf8brjfkLpfCT/+Mw6vs=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-YFdGWGm+DUi/0l9YBliQH1VgpYEVcHVgLirJTrNmNP4=";
};
propagatedBuildInputs = [
@@ -41,11 +43,18 @@ buildPythonPackage rec {
pillow
pydantic
pyjwt
- python-dotenv
pytz
typer
];
+ passthru.optional-dependencies = {
+ shell = [
+ ipython
+ python-dotenv
+ termcolor
+ ];
+ };
+
checkInputs = [
pytest-aiohttp
pytest-asyncio
@@ -56,9 +65,6 @@ buildPythonPackage rec {
];
postPatch = ''
- # https://github.com/briis/pyunifiprotect/pull/176
- substituteInPlace setup.cfg \
- --replace "asyncio" "aiohttp"
substituteInPlace pyproject.toml \
--replace "--cov=pyunifiprotect --cov-append" ""
'';
diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index cfcc235f1500..f13f763974b6 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -2,8 +2,7 @@
, buildPythonPackage
, fetchPypi
, pkg-config
-, pytest
-, pytest-runner
+, pytestCheckHook
, cffi
, secp256k1
}:
@@ -17,30 +16,27 @@ buildPythonPackage rec {
sha256 = "82c06712d69ef945220c8b53c1a0d424c2ff6a1f64aee609030df79ad8383397";
};
+ postPatch = ''
+ # don't do hacky tarball download + setuptools check
+ sed -i '38,54d' setup.py
+ substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" ""
+ '';
+
nativeBuildInputs = [ pkg-config ];
- checkInputs = [ pytest pytest-runner ];
+
propagatedBuildInputs = [ cffi secp256k1 ];
+ checkInputs = [ pytestCheckHook ];
+
# Tests are not included in archive
doCheck = false;
preConfigure = ''
cp -r ${secp256k1.src} libsecp256k1
- touch libsecp256k1/autogen.sh
export INCLUDE_DIR=${secp256k1}/include
export LIB_DIR=${secp256k1}/lib
'';
- checkPhase = ''
- py.test tests
- '';
-
- postPatch = ''
- # don't do hacky tarball download + setuptools check
- sed -i '38,54d' setup.py
- substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" ""
- '';
-
meta = {
homepage = "https://github.com/ludbb/secp256k1-py";
description = "Python FFI bindings for secp256k1";
diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix
index 7fe887d3ea10..1511d1940b03 100644
--- a/pkgs/development/python-modules/skodaconnect/default.nix
+++ b/pkgs/development/python-modules/skodaconnect/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "skodaconnect";
- version = "1.1.19";
+ version = "1.1.20";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "lendy007";
repo = pname;
- rev = version;
- hash = "sha256-IbCGveRcn6Kn0kGw+/kWTBTqCdWqsPTv6aPq71vc1mw=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-VFbU4KbF/Z8/EiRYZIBXSIfByY5nc84y6YBSOuknqyg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix
index 24812deb1f9e..9a050e9c2b5a 100644
--- a/pkgs/development/python-modules/skytemple-dtef/default.nix
+++ b/pkgs/development/python-modules/skytemple-dtef/default.nix
@@ -1,25 +1,43 @@
-{ lib, buildPythonPackage, fetchFromGitHub, skytemple-files }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pillow
+, pytestCheckHook
+, pythonOlder
+, skytemple-files
+}:
buildPythonPackage rec {
pname = "skytemple-dtef";
- version = "1.1.4";
+ version = "1.1.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "0l2b66z5ngyas3ijbzwz2wizw46kz47f8jr729pzbg4wbqbqjihr";
+ hash = "sha256-QL+nLmjz0wCED2RjidIDK0tB6mAPnoaSJWpyLFu0pP4=";
};
- propagatedBuildInputs = [ skytemple-files ];
+ propagatedBuildInputs = [
+ pillow
+ skytemple-files
+ ];
- doCheck = false; # there are no tests
- pythonImportsCheck = [ "skytemple_dtef" ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "skytemple_dtef"
+ ];
meta = with lib; {
- homepage = "https://github.com/SkyTemple/skytemple-dtef";
description = "A format for standardized rule-based tilesets with 256 adjacency combinations";
+ homepage = "https://github.com/SkyTemple/skytemple-dtef";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ xfix ];
+ maintainers = with maintainers; [ marius851000 xfix ];
};
}
diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix
index 10a6e3b00d50..1c5869ac5377 100644
--- a/pkgs/development/python-modules/tmb/default.nix
+++ b/pkgs/development/python-modules/tmb/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "tmb";
- version = "0.1.3";
+ version = "0.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "alemuro";
repo = pname;
rev = version;
- hash = "sha256-/syHSu9LKLDe3awrgSIHh0hV+raWqKd53f43WagHn9c=";
+ hash = "sha256-XuRhRmeTXAplb14UwISyzaqEIrFeg8/aCdMxUccMUos=";
};
VERSION = version;
diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix
index da0544c299cd..be85d3d31770 100644
--- a/pkgs/development/python-modules/torchinfo/default.nix
+++ b/pkgs/development/python-modules/torchinfo/default.nix
@@ -1,21 +1,24 @@
{ lib
-, fetchPypi
-, python
, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
, pythonOlder
, pytorch
-, pytestCheckHook
, torchvision
}:
buildPythonPackage rec {
pname = "torchinfo";
- version = "1.6.5";
+ version = "1.7.0";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-Vg/TXD+/VMIv1wHywaOuEj4MDTq90lUo99n+Nppu0uI=";
+ src = fetchFromGitHub {
+ owner = "TylerYep";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-SfhFyv5ISbOG3srOK3m9BeSIkA7M8qJTm95GyfdqzcA=";
};
propagatedBuildInputs = [
@@ -30,14 +33,18 @@ buildPythonPackage rec {
disabledTests = [
# Skip as it downloads pretrained weights (require network access)
"test_eval_order_doesnt_matter"
+ # AssertionError in output
+ "test_google"
];
- pythonImportsCheck = [ "torchvision" ];
+ pythonImportsCheck = [
+ "torchvision"
+ ];
- meta = {
+ meta = with lib; {
description = "API to visualize pytorch models";
homepage = "https://github.com/TylerYep/torchinfo";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ petterstorvik ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ petterstorvik ];
};
}
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index d9519130761d..70ea28d23151 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "1.1.3";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
- sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";
+ sha256 = "sha256-b0a5TaB0muojqLCxTVvD95zgGp7gz72OvxfK+QtZV8k=";
};
- cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";
+ cargoSha256 = "sha256-ka5Np7YxfYRL42ipClD9xWTYA2vynDjQqy/6IsP5Ejs=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 47f08d4dcc8d..a051087bdd2f 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -30,6 +30,13 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
installManPage texlab.1
+
+ # Remove generated dylib of human_name dependency. TexLab statically
+ # links to the generated rlib and doesn't reference the dylib. I
+ # couldn't find any way to prevent building this by passing cargo flags.
+ # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43
+ rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}"
+ rmdir "$out/lib"
'';
passthru.updateScript = nix-update-script {
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index c99e0047f0d1..073bd6e7fab2 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
- version = "1.29.1";
+ version = "1.30.0";
inherit (poetryLib) isCompatible readTOML moduleName;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
index dca0936ca73f..df66d2be5664 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
@@ -928,6 +928,9 @@
"pkgconfig": [
"poetry-core"
],
+ "plux": [
+ "pytest-runner"
+ ],
"poetry": [
"poetry-core"
],
@@ -982,6 +985,9 @@
"pvo": [
"poetry-core"
],
+ "py-multihash": [
+ "pytest-runner"
+ ],
"py-synologydsm-api": [
"poetry-core"
],
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
index ce9805cd41ef..47efe53d4ee3 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
@@ -163,6 +163,13 @@ lib.composeManyExtensions [
attr = "flit-core";
} else super.argon2-cffi;
+ awscrt = super.awscrt.overridePythonAttrs (
+ old: {
+ nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs;
+ dontUseCmakeConfigure = true;
+ }
+ );
+
bcrypt = super.bcrypt.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ];
@@ -1098,11 +1105,16 @@ lib.composeManyExtensions [
url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch";
sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk=";
})
- ] ++ lib.optionals (lib.strings.versionAtLeast old.version "0.940") [
+ ] ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.940") && lib.strings.versionOlder old.version "0.960") [
(pkgs.fetchpatch {
url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch";
sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM=";
})
+ ] ++ lib.optionals (lib.strings.versionAtLeast old.version "0.960") [
+ (pkgs.fetchpatch {
+ url = "https://github.com/python/mypy/compare/a6166b2f..5b3c9888.patch";
+ sha256 = "sha256-3QY99ctkIv9PoNfcTKF9TZFBwAIVOqPLKBVP6rDQ9FU=";
+ })
];
}
);
@@ -1454,6 +1466,14 @@ lib.composeManyExtensions [
}
);
+ pyfftw = super.pyfftw.overridePythonAttrs (old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [
+ pkgs.fftw
+ pkgs.fftwFloat
+ pkgs.fftwLongDouble
+ ];
+ });
+
pyfuse3 = super.pyfuse3.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ];
@@ -1887,7 +1907,7 @@ lib.composeManyExtensions [
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];
inherit (pkgs.python3.pkgs.shapely) GEOS_LIBRARY_PATH;
- GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
+ GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${lib.getLib stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
# Fix library paths
postPatch = old.postPatch or "" + ''
@@ -2346,7 +2366,7 @@ lib.composeManyExtensions [
});
wtforms = super.wtforms.overridePythonAttrs (old: {
- buildInputs = (old.buildInputs or [ ]) ++ [ self.babel ];
+ buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ];
});
}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
index 5f179e2415d7..528b840cfd8c 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
@@ -20,18 +20,6 @@ docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
-[[package]]
-name = "backports.functools-lru-cache"
-version = "1.6.4"
-description = "Backport of functools.lru_cache"
-category = "dev"
-optional = false
-python-versions = ">=2.6"
-
-[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-checkdocs (>=2.4)"]
-
[[package]]
name = "cachecontrol"
version = "0.12.6"
@@ -51,7 +39,7 @@ redis = ["redis (>=2.10.5)"]
[[package]]
name = "cachecontrol"
-version = "0.12.10"
+version = "0.12.11"
description = "httplib2 caching for requests"
category = "main"
optional = false
@@ -135,10 +123,8 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[package.dependencies]
crashtest = {version = ">=0.3.0,<0.4.0", markers = "python_version >= \"3.6\" and python_version < \"4.0\""}
-enum34 = {version = ">=1.1,<2.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
pastel = ">=0.2.0,<0.3.0"
pylev = ">=1.3,<2.0"
-typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""}
typing-extensions = {version = ">=3.6,<4.0", markers = "python_version >= \"3.5\" and python_full_version < \"3.5.4\""}
[[package]]
@@ -149,26 +135,6 @@ category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-[[package]]
-name = "configparser"
-version = "4.0.2"
-description = "Updated configparser from Python 3.7 for Python 2.6+."
-category = "main"
-optional = false
-python-versions = ">=2.6"
-
-[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"]
-
-[[package]]
-name = "contextlib2"
-version = "0.6.0.post1"
-description = "Backports and enhancements for the contextlib module"
-category = "main"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-
[[package]]
name = "coverage"
version = "5.5"
@@ -209,28 +175,7 @@ test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz"
[[package]]
name = "cryptography"
-version = "3.3.2"
-description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
-category = "main"
-optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
-
-[package.dependencies]
-cffi = ">=1.12"
-enum34 = {version = "*", markers = "python_version < \"3\""}
-ipaddress = {version = "*", markers = "python_version < \"3\""}
-six = ">=1.4.1"
-
-[package.extras]
-docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
-docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
-pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
-ssh = ["bcrypt (>=3.1.5)"]
-test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
-
-[[package]]
-name = "cryptography"
-version = "36.0.2"
+version = "37.0.2"
description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
category = "main"
optional = false
@@ -245,7 +190,7 @@ docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling
pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
sdist = ["setuptools_rust (>=0.11.4)"]
ssh = ["bcrypt (>=3.1.5)"]
-test = ["pytest (>=6.2.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
[[package]]
name = "distlib"
@@ -255,25 +200,6 @@ category = "main"
optional = false
python-versions = "*"
-[[package]]
-name = "entrypoints"
-version = "0.3"
-description = "Discover and load entry points from installed packages."
-category = "main"
-optional = false
-python-versions = ">=2.7"
-
-[package.dependencies]
-configparser = {version = ">=3.5", markers = "python_version == \"2.7\""}
-
-[[package]]
-name = "enum34"
-version = "1.1.10"
-description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"
-category = "main"
-optional = false
-python-versions = "*"
-
[[package]]
name = "filelock"
version = "3.2.1"
@@ -286,38 +212,6 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
testing = ["coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"]
-[[package]]
-name = "funcsigs"
-version = "1.0.2"
-description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
-category = "dev"
-optional = false
-python-versions = "*"
-
-[[package]]
-name = "functools32"
-version = "3.2.3-2"
-description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy."
-category = "main"
-optional = false
-python-versions = "*"
-
-[[package]]
-name = "futures"
-version = "3.3.0"
-description = "Backport of the concurrent.futures package from Python 3"
-category = "main"
-optional = false
-python-versions = ">=2.6, <3"
-
-[[package]]
-name = "glob2"
-version = "0.6"
-description = "Version of the glob module that can capture patterns and supports recursive wildcards"
-category = "main"
-optional = false
-python-versions = "*"
-
[[package]]
name = "html5lib"
version = "1.1"
@@ -338,14 +232,11 @@ lxml = ["lxml"]
[[package]]
name = "httpretty"
-version = "0.9.7"
+version = "1.1.4"
description = "HTTP client mock for Python"
category = "dev"
optional = false
-python-versions = "*"
-
-[package.dependencies]
-six = "*"
+python-versions = ">=3"
[[package]]
name = "identify"
@@ -375,9 +266,6 @@ optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
[package.dependencies]
-configparser = {version = ">=3.5", markers = "python_version < \"3\""}
-contextlib2 = {version = "*", markers = "python_version < \"3\""}
-pathlib2 = {version = "*", markers = "python_version < \"3\""}
zipp = ">=0.5"
[package.extras]
@@ -393,10 +281,6 @@ optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
[package.dependencies]
-contextlib2 = {version = "*", markers = "python_version < \"3\""}
-pathlib2 = {version = "*", markers = "python_version < \"3\""}
-singledispatch = {version = "*", markers = "python_version < \"3.4\""}
-typing = {version = "*", markers = "python_version < \"3.5\""}
zipp = {version = ">=0.4", markers = "python_version < \"3.8\""}
[package.extras]
@@ -410,14 +294,6 @@ category = "dev"
optional = false
python-versions = "*"
-[[package]]
-name = "ipaddress"
-version = "1.0.23"
-description = "IPv4/IPv6 manipulation library"
-category = "main"
-optional = false
-python-versions = "*"
-
[[package]]
name = "jeepney"
version = "0.4.3"
@@ -441,23 +317,6 @@ python-versions = ">=3.6"
test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio", "async-timeout"]
trio = ["trio", "async-generator"]
-[[package]]
-name = "keyring"
-version = "18.0.1"
-description = "Store and access your passwords safely."
-category = "main"
-optional = false
-python-versions = ">=2.7"
-
-[package.dependencies]
-entrypoints = "*"
-pywin32-ctypes = {version = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1", markers = "sys_platform == \"win32\""}
-secretstorage = {version = "<3", markers = "(sys_platform == \"linux2\" or sys_platform == \"linux\") and python_version < \"3.5\""}
-
-[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs", "pytest-flake8"]
-
[[package]]
name = "keyring"
version = "20.0.1"
@@ -501,45 +360,9 @@ category = "main"
optional = false
python-versions = "*"
-[[package]]
-name = "mock"
-version = "3.0.5"
-description = "Rolling backport of unittest.mock for all Pythons"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-
-[package.dependencies]
-funcsigs = {version = ">=1", markers = "python_version < \"3.3\""}
-six = "*"
-
-[package.extras]
-build = ["twine", "wheel", "blurb"]
-docs = ["sphinx"]
-test = ["pytest", "pytest-cov"]
-
[[package]]
name = "more-itertools"
-version = "5.0.0"
-description = "More routines for operating on iterables, beyond itertools"
-category = "dev"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-six = ">=1.0.0,<2.0.0"
-
-[[package]]
-name = "more-itertools"
-version = "7.2.0"
-description = "More routines for operating on iterables, beyond itertools"
-category = "dev"
-optional = false
-python-versions = ">=3.4"
-
-[[package]]
-name = "more-itertools"
-version = "8.12.0"
+version = "8.13.0"
description = "More routines for operating on iterables, beyond itertools"
category = "dev"
optional = false
@@ -547,8 +370,8 @@ python-versions = ">=3.5"
[[package]]
name = "msgpack"
-version = "1.0.3"
-description = "MessagePack (de)serializer."
+version = "1.0.4"
+description = "MessagePack serializer"
category = "main"
optional = false
python-versions = "*"
@@ -589,9 +412,7 @@ optional = false
python-versions = "*"
[package.dependencies]
-scandir = {version = "*", markers = "python_version < \"3.5\""}
six = "*"
-typing = {version = "*", markers = "python_version < \"3.5\""}
[[package]]
name = "pexpect"
@@ -646,11 +467,7 @@ optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[package.dependencies]
-enum34 = {version = ">=1.1.10,<2.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
-functools32 = {version = ">=3.2.3-2,<4.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
importlib-metadata = {version = ">=1.7.0,<2.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.5\" and python_version < \"3.8\""}
-pathlib2 = {version = ">=2.3.5,<3.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
-typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
[[package]]
name = "pre-commit"
@@ -710,34 +527,6 @@ category = "main"
optional = false
python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-[[package]]
-name = "pytest"
-version = "4.6.11"
-description = "pytest: simple powerful testing with Python"
-category = "dev"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
-
-[package.dependencies]
-atomicwrites = ">=1.0"
-attrs = ">=17.4.0"
-colorama = {version = "*", markers = "sys_platform == \"win32\" and python_version != \"3.4\""}
-funcsigs = {version = ">=1.0", markers = "python_version < \"3.0\""}
-importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
-more-itertools = [
- {version = ">=4.0.0,<6.0.0", markers = "python_version <= \"2.7\""},
- {version = ">=4.0.0", markers = "python_version > \"2.7\""},
-]
-packaging = "*"
-pathlib2 = {version = ">=2.2.0", markers = "python_version < \"3.6\""}
-pluggy = ">=0.12,<1.0"
-py = ">=1.5.0"
-six = ">=1.10.0"
-wcwidth = "*"
-
-[package.extras]
-testing = ["argcomplete", "hypothesis (>=3.56)", "nose", "requests", "mock"]
-
[[package]]
name = "pytest"
version = "5.4.3"
@@ -809,7 +598,6 @@ optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
[package.dependencies]
-mock = {version = "*", markers = "python_version < \"3.0\""}
pytest = ">=2.7"
[package.extras]
@@ -873,28 +661,6 @@ python-versions = "*"
[package.dependencies]
requests = ">=2.0.1,<3.0.0"
-[[package]]
-name = "scandir"
-version = "1.10.0"
-description = "scandir, a better directory iterator and faster os.walk()"
-category = "main"
-optional = false
-python-versions = "*"
-
-[[package]]
-name = "secretstorage"
-version = "2.3.1"
-description = "Python bindings to FreeDesktop.org Secret Service API"
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-cryptography = "*"
-
-[package.extras]
-dbus-python = ["dbus-python"]
-
[[package]]
name = "secretstorage"
version = "3.2.0"
@@ -909,7 +675,7 @@ jeepney = ">=0.4.2"
[[package]]
name = "secretstorage"
-version = "3.3.1"
+version = "3.3.2"
description = "Python bindings to FreeDesktop.org Secret Service API"
category = "main"
optional = false
@@ -927,21 +693,6 @@ category = "main"
optional = false
python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6"
-[[package]]
-name = "singledispatch"
-version = "3.7.0"
-description = "Backport functools.singledispatch from Python 3.4 to Python 2.6-3.3."
-category = "main"
-optional = false
-python-versions = ">=2.6"
-
-[package.dependencies]
-six = "*"
-
-[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=4.6)", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "unittest2", "pytest-checkdocs (>=2.4)"]
-
[[package]]
name = "six"
version = "1.16.0"
@@ -950,14 +701,6 @@ category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-[[package]]
-name = "subprocess32"
-version = "3.5.4"
-description = "A backport of the subprocess module from Python 3 for use on 2.x."
-category = "main"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4"
-
[[package]]
name = "termcolor"
version = "1.1.0"
@@ -982,14 +725,9 @@ category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-[package.dependencies]
-enum34 = {version = ">=1.1,<2.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
-functools32 = {version = ">=3.2.3,<4.0.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
-typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""}
-
[[package]]
name = "tox"
-version = "3.24.5"
+version = "3.25.0"
description = "tox is a generic virtualenv management and test command line tool"
category = "dev"
optional = false
@@ -1010,14 +748,6 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
-[[package]]
-name = "typing"
-version = "3.10.0.0"
-description = "Type Hints for Python"
-category = "main"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <3.5"
-
[[package]]
name = "typing-extensions"
version = "3.10.0.2"
@@ -1028,20 +758,20 @@ python-versions = "*"
[[package]]
name = "urllib3"
-version = "1.25.11"
+version = "1.26.9"
description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
[package.extras]
-brotli = ["brotlipy (>=0.6.0)"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[[package]]
name = "virtualenv"
-version = "20.14.0"
+version = "20.14.1"
description = "Virtual Python Environment builder"
category = "main"
optional = false
@@ -1052,7 +782,6 @@ distlib = ">=0.3.1,<1"
filelock = ">=3.2,<4"
importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
importlib-resources = {version = ">=1.0", markers = "python_version < \"3.7\""}
-pathlib2 = {version = ">=2.3.3,<3", markers = "python_version < \"3.4\" and sys_platform != \"win32\""}
platformdirs = ">=2,<3"
six = ">=1.9.0,<2"
@@ -1068,9 +797,6 @@ category = "dev"
optional = false
python-versions = "*"
-[package.dependencies]
-"backports.functools-lru-cache" = {version = ">=1.2.1", markers = "python_version < \"3.2\""}
-
[[package]]
name = "webencodings"
version = "0.5.1"
@@ -1087,17 +813,14 @@ category = "main"
optional = false
python-versions = ">=2.7"
-[package.dependencies]
-contextlib2 = {version = "*", markers = "python_version < \"3.4\""}
-
[package.extras]
docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"]
[metadata]
lock-version = "1.1"
-python-versions = "~2.7 || ^3.5"
-content-hash = "3de9a28e5a2f53d26b75a9aa3eb333b360eb04470769675fb435183ab871798c"
+python-versions = "^3.5"
+content-hash = "9ef4eff67412cb5b3e575b88a4424e26f4f8a519ee503046ec435c9c10786d00"
[metadata.files]
atomicwrites = [
@@ -1108,15 +831,11 @@ attrs = [
{file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
{file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
]
-"backports.functools-lru-cache" = [
- {file = "backports.functools_lru_cache-1.6.4-py2.py3-none-any.whl", hash = "sha256:dbead04b9daa817909ec64e8d2855fb78feafe0b901d4568758e3a60559d8978"},
- {file = "backports.functools_lru_cache-1.6.4.tar.gz", hash = "sha256:d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"},
-]
cachecontrol = [
{file = "CacheControl-0.12.6-py2.py3-none-any.whl", hash = "sha256:10d056fa27f8563a271b345207402a6dcce8efab7e5b377e270329c62471b10d"},
{file = "CacheControl-0.12.6.tar.gz", hash = "sha256:be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8"},
- {file = "CacheControl-0.12.10-py2.py3-none-any.whl", hash = "sha256:b0d43d8f71948ef5ebdee5fe236b86c6ffc7799370453dccb0e894c20dfa487c"},
- {file = "CacheControl-0.12.10.tar.gz", hash = "sha256:d8aca75b82eec92d84b5d6eb8c8f66ea16f09d2adb09dbca27fe2d5fc8d3732d"},
+ {file = "CacheControl-0.12.11-py2.py3-none-any.whl", hash = "sha256:2c75d6a8938cb1933c75c50184549ad42728a27e9f6b92fd677c3151aa72555b"},
+ {file = "CacheControl-0.12.11.tar.gz", hash = "sha256:a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144"},
]
cachy = [
{file = "cachy-0.3.0-py2.py3-none-any.whl", hash = "sha256:338ca09c8860e76b275aff52374330efedc4d5a5e45dc1c5b539c1ead0786fe7"},
@@ -1198,14 +917,6 @@ colorama = [
{file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
{file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
]
-configparser = [
- {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"},
- {file = "configparser-4.0.2.tar.gz", hash = "sha256:c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"},
-]
-contextlib2 = [
- {file = "contextlib2-0.6.0.post1-py2.py3-none-any.whl", hash = "sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b"},
- {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"},
-]
coverage = [
{file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"},
{file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"},
@@ -1287,79 +998,43 @@ cryptography = [
{file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"},
{file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"},
{file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"},
- {file = "cryptography-3.3.2-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed"},
- {file = "cryptography-3.3.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3"},
- {file = "cryptography-3.3.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042"},
- {file = "cryptography-3.3.2-cp27-cp27m-win32.whl", hash = "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b"},
- {file = "cryptography-3.3.2-cp27-cp27m-win_amd64.whl", hash = "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff"},
- {file = "cryptography-3.3.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da"},
- {file = "cryptography-3.3.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f"},
- {file = "cryptography-3.3.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72"},
- {file = "cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e"},
- {file = "cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44"},
- {file = "cryptography-3.3.2-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed"},
- {file = "cryptography-3.3.2-cp36-abi3-win32.whl", hash = "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c"},
- {file = "cryptography-3.3.2-cp36-abi3-win_amd64.whl", hash = "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433"},
- {file = "cryptography-3.3.2.tar.gz", hash = "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed"},
- {file = "cryptography-36.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:4e2dddd38a5ba733be6a025a1475a9f45e4e41139d1321f412c6b360b19070b6"},
- {file = "cryptography-36.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:4881d09298cd0b669bb15b9cfe6166f16fc1277b4ed0d04a22f3d6430cb30f1d"},
- {file = "cryptography-36.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ea634401ca02367c1567f012317502ef3437522e2fc44a3ea1844de028fa4b84"},
- {file = "cryptography-36.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:7be666cc4599b415f320839e36367b273db8501127b38316f3b9f22f17a0b815"},
- {file = "cryptography-36.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf"},
- {file = "cryptography-36.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf"},
- {file = "cryptography-36.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:c2c5250ff0d36fd58550252f54915776940e4e866f38f3a7866d92b32a654b86"},
- {file = "cryptography-36.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:ec6597aa85ce03f3e507566b8bcdf9da2227ec86c4266bd5e6ab4d9e0cc8dab2"},
- {file = "cryptography-36.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ca9f686517ec2c4a4ce930207f75c00bf03d94e5063cbc00a1dc42531511b7eb"},
- {file = "cryptography-36.0.2-cp36-abi3-win32.whl", hash = "sha256:f64b232348ee82f13aac22856515ce0195837f6968aeaa94a3d0353ea2ec06a6"},
- {file = "cryptography-36.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:53e0285b49fd0ab6e604f4c5d9c5ddd98de77018542e88366923f152dbeb3c29"},
- {file = "cryptography-36.0.2-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:32db5cc49c73f39aac27574522cecd0a4bb7384e71198bc65a0d23f901e89bb7"},
- {file = "cryptography-36.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b3d199647468d410994dbeb8cec5816fb74feb9368aedf300af709ef507e3e"},
- {file = "cryptography-36.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:da73d095f8590ad437cd5e9faf6628a218aa7c387e1fdf67b888b47ba56a17f0"},
- {file = "cryptography-36.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:0a3bf09bb0b7a2c93ce7b98cb107e9170a90c51a0162a20af1c61c765b90e60b"},
- {file = "cryptography-36.0.2-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8897b7b7ec077c819187a123174b645eb680c13df68354ed99f9b40a50898f77"},
- {file = "cryptography-36.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82740818f2f240a5da8dfb8943b360e4f24022b093207160c77cadade47d7c85"},
- {file = "cryptography-36.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1f64a62b3b75e4005df19d3b5235abd43fa6358d5516cfc43d87aeba8d08dd51"},
- {file = "cryptography-36.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e167b6b710c7f7bc54e67ef593f8731e1f45aa35f8a8a7b72d6e42ec76afd4b3"},
- {file = "cryptography-36.0.2.tar.gz", hash = "sha256:70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9"},
+ {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181"},
+ {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336"},
+ {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004"},
+ {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe"},
+ {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804"},
+ {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c"},
+ {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178"},
+ {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a"},
+ {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15"},
+ {file = "cryptography-37.0.2-cp36-abi3-win32.whl", hash = "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0"},
+ {file = "cryptography-37.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d"},
+ {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9"},
+ {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1"},
+ {file = "cryptography-37.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023"},
+ {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06"},
+ {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717"},
+ {file = "cryptography-37.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f"},
+ {file = "cryptography-37.0.2-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982"},
+ {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4"},
+ {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de"},
+ {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"},
+ {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"},
]
distlib = [
{file = "distlib-0.3.4-py2.py3-none-any.whl", hash = "sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b"},
{file = "distlib-0.3.4.zip", hash = "sha256:e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"},
]
-entrypoints = [
- {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"},
- {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"},
-]
-enum34 = [
- {file = "enum34-1.1.10-py2-none-any.whl", hash = "sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53"},
- {file = "enum34-1.1.10-py3-none-any.whl", hash = "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328"},
- {file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"},
-]
filelock = [
{file = "filelock-3.2.1-py2.py3-none-any.whl", hash = "sha256:7f07b08d731907441ff40d0c5b81f9512cd968842e0b6264c8bd18a8ce877760"},
{file = "filelock-3.2.1.tar.gz", hash = "sha256:9cdd29c411ab196cf4c35a1da684f7b9da723696cb356efa45bf5eb1ff313ee3"},
]
-funcsigs = [
- {file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"},
- {file = "funcsigs-1.0.2.tar.gz", hash = "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"},
-]
-functools32 = [
- {file = "functools32-3.2.3-2.tar.gz", hash = "sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"},
- {file = "functools32-3.2.3-2.zip", hash = "sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0"},
-]
-futures = [
- {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"},
- {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"},
-]
-glob2 = [
- {file = "glob2-0.6.tar.gz", hash = "sha256:f5b0a686ff21f820c4d3f0c4edd216704cea59d79d00fa337e244a2f2ff83ed6"},
-]
html5lib = [
{file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"},
{file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"},
]
httpretty = [
- {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"},
+ {file = "httpretty-1.1.4.tar.gz", hash = "sha256:20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"},
]
identify = [
{file = "identify-2.4.4-py2.py3-none-any.whl", hash = "sha256:aa68609c7454dbcaae60a01ff6b8df1de9b39fe6e50b1f6107ec81dcda624aa6"},
@@ -1381,10 +1056,6 @@ iniconfig = [
{file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
{file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
]
-ipaddress = [
- {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"},
- {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"},
-]
jeepney = [
{file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"},
{file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"},
@@ -1392,8 +1063,6 @@ jeepney = [
{file = "jeepney-0.7.1.tar.gz", hash = "sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"},
]
keyring = [
- {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"},
- {file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"},
{file = "keyring-20.0.1-py2.py3-none-any.whl", hash = "sha256:c674f032424b4bffc62abeac5523ec49cc84aed07a480c3233e0baf618efc15c"},
{file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"},
{file = "keyring-22.3.0-py3-none-any.whl", hash = "sha256:2bc8363ebdd63886126a012057a85c8cb6e143877afa02619ac7dbc9f38a207b"},
@@ -1403,54 +1072,63 @@ lockfile = [
{file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"},
{file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"},
]
-mock = [
- {file = "mock-3.0.5-py2.py3-none-any.whl", hash = "sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"},
- {file = "mock-3.0.5.tar.gz", hash = "sha256:83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"},
-]
more-itertools = [
- {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"},
- {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"},
- {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"},
- {file = "more-itertools-7.2.0.tar.gz", hash = "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"},
- {file = "more_itertools-7.2.0-py3-none-any.whl", hash = "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"},
- {file = "more-itertools-8.12.0.tar.gz", hash = "sha256:7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064"},
- {file = "more_itertools-8.12.0-py3-none-any.whl", hash = "sha256:43e6dd9942dffd72661a2c4ef383ad7da1e6a3e968a927ad7a6083ab410a688b"},
+ {file = "more-itertools-8.13.0.tar.gz", hash = "sha256:a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f"},
+ {file = "more_itertools-8.13.0-py3-none-any.whl", hash = "sha256:c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb"},
]
msgpack = [
- {file = "msgpack-1.0.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:96acc674bb9c9be63fa8b6dabc3248fdc575c4adc005c440ad02f87ca7edd079"},
- {file = "msgpack-1.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2c3ca57c96c8e69c1a0d2926a6acf2d9a522b41dc4253a8945c4c6cd4981a4e3"},
- {file = "msgpack-1.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b0a792c091bac433dfe0a70ac17fc2087d4595ab835b47b89defc8bbabcf5c73"},
- {file = "msgpack-1.0.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c58cdec1cb5fcea8c2f1771d7b5fec79307d056874f746690bd2bdd609ab147"},
- {file = "msgpack-1.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f97c0f35b3b096a330bb4a1a9247d0bd7e1f3a2eba7ab69795501504b1c2c39"},
- {file = "msgpack-1.0.3-cp310-cp310-win32.whl", hash = "sha256:36a64a10b16c2ab31dcd5f32d9787ed41fe68ab23dd66957ca2826c7f10d0b85"},
- {file = "msgpack-1.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:c1ba333b4024c17c7591f0f372e2daa3c31db495a9b2af3cf664aef3c14354f7"},
- {file = "msgpack-1.0.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c2140cf7a3ec475ef0938edb6eb363fa704159e0bf71dde15d953bacc1cf9d7d"},
- {file = "msgpack-1.0.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f4c22717c74d44bcd7af353024ce71c6b55346dad5e2cc1ddc17ce8c4507c6b"},
- {file = "msgpack-1.0.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d733a15ade190540c703de209ffbc42a3367600421b62ac0c09fde594da6ec"},
- {file = "msgpack-1.0.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c7e03b06f2982aa98d4ddd082a210c3db200471da523f9ac197f2828e80e7770"},
- {file = "msgpack-1.0.3-cp36-cp36m-win32.whl", hash = "sha256:3d875631ecab42f65f9dce6f55ce6d736696ced240f2634633188de2f5f21af9"},
- {file = "msgpack-1.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:40fb89b4625d12d6027a19f4df18a4de5c64f6f3314325049f219683e07e678a"},
- {file = "msgpack-1.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6eef0cf8db3857b2b556213d97dd82de76e28a6524853a9beb3264983391dc1a"},
- {file = "msgpack-1.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d8c332f53ffff01953ad25131272506500b14750c1d0ce8614b17d098252fbc"},
- {file = "msgpack-1.0.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c0903bd93cbd34653dd63bbfcb99d7539c372795201f39d16fdfde4418de43a"},
- {file = "msgpack-1.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bf1e6bfed4860d72106f4e0a1ab519546982b45689937b40257cfd820650b920"},
- {file = "msgpack-1.0.3-cp37-cp37m-win32.whl", hash = "sha256:d02cea2252abc3756b2ac31f781f7a98e89ff9759b2e7450a1c7a0d13302ff50"},
- {file = "msgpack-1.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:2f30dd0dc4dfe6231ad253b6f9f7128ac3202ae49edd3f10d311adc358772dba"},
- {file = "msgpack-1.0.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f201d34dc89342fabb2a10ed7c9a9aaaed9b7af0f16a5923f1ae562b31258dea"},
- {file = "msgpack-1.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bb87f23ae7d14b7b3c21009c4b1705ec107cb21ee71975992f6aca571fb4a42a"},
- {file = "msgpack-1.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8a3a5c4b16e9d0edb823fe54b59b5660cc8d4782d7bf2c214cb4b91a1940a8ef"},
- {file = "msgpack-1.0.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f74da1e5fcf20ade12c6bf1baa17a2dc3604958922de8dc83cbe3eff22e8b611"},
- {file = "msgpack-1.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:73a80bd6eb6bcb338c1ec0da273f87420829c266379c8c82fa14c23fb586cfa1"},
- {file = "msgpack-1.0.3-cp38-cp38-win32.whl", hash = "sha256:9fce00156e79af37bb6db4e7587b30d11e7ac6a02cb5bac387f023808cd7d7f4"},
- {file = "msgpack-1.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:9b6f2d714c506e79cbead331de9aae6837c8dd36190d02da74cb409b36162e8a"},
- {file = "msgpack-1.0.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:89908aea5f46ee1474cc37fbc146677f8529ac99201bc2faf4ef8edc023c2bf3"},
- {file = "msgpack-1.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:973ad69fd7e31159eae8f580f3f707b718b61141838321c6fa4d891c4a2cca52"},
- {file = "msgpack-1.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da24375ab4c50e5b7486c115a3198d207954fe10aaa5708f7b65105df09109b2"},
- {file = "msgpack-1.0.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a598d0685e4ae07a0672b59792d2cc767d09d7a7f39fd9bd37ff84e060b1a996"},
- {file = "msgpack-1.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4c309a68cb5d6bbd0c50d5c71a25ae81f268c2dc675c6f4ea8ab2feec2ac4e2"},
- {file = "msgpack-1.0.3-cp39-cp39-win32.whl", hash = "sha256:494471d65b25a8751d19c83f1a482fd411d7ca7a3b9e17d25980a74075ba0e88"},
- {file = "msgpack-1.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:f01b26c2290cbd74316990ba84a14ac3d599af9cebefc543d241a66e785cf17d"},
- {file = "msgpack-1.0.3.tar.gz", hash = "sha256:51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e"},
+ {file = "msgpack-1.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4ab251d229d10498e9a2f3b1e68ef64cb393394ec477e3370c457f9430ce9250"},
+ {file = "msgpack-1.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:112b0f93202d7c0fef0b7810d465fde23c746a2d482e1e2de2aafd2ce1492c88"},
+ {file = "msgpack-1.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:002b5c72b6cd9b4bafd790f364b8480e859b4712e91f43014fe01e4f957b8467"},
+ {file = "msgpack-1.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:35bc0faa494b0f1d851fd29129b2575b2e26d41d177caacd4206d81502d4c6a6"},
+ {file = "msgpack-1.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4733359808c56d5d7756628736061c432ded018e7a1dff2d35a02439043321aa"},
+ {file = "msgpack-1.0.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb514ad14edf07a1dbe63761fd30f89ae79b42625731e1ccf5e1f1092950eaa6"},
+ {file = "msgpack-1.0.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:c23080fdeec4716aede32b4e0ef7e213c7b1093eede9ee010949f2a418ced6ba"},
+ {file = "msgpack-1.0.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:49565b0e3d7896d9ea71d9095df15b7f75a035c49be733051c34762ca95bbf7e"},
+ {file = "msgpack-1.0.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:aca0f1644d6b5a73eb3e74d4d64d5d8c6c3d577e753a04c9e9c87d07692c58db"},
+ {file = "msgpack-1.0.4-cp310-cp310-win32.whl", hash = "sha256:0dfe3947db5fb9ce52aaea6ca28112a170db9eae75adf9339a1aec434dc954ef"},
+ {file = "msgpack-1.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:4dea20515f660aa6b7e964433b1808d098dcfcabbebeaaad240d11f909298075"},
+ {file = "msgpack-1.0.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e83f80a7fec1a62cf4e6c9a660e39c7f878f603737a0cdac8c13131d11d97f52"},
+ {file = "msgpack-1.0.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c11a48cf5e59026ad7cb0dc29e29a01b5a66a3e333dc11c04f7e991fc5510a9"},
+ {file = "msgpack-1.0.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1276e8f34e139aeff1c77a3cefb295598b504ac5314d32c8c3d54d24fadb94c9"},
+ {file = "msgpack-1.0.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c9566f2c39ccced0a38d37c26cc3570983b97833c365a6044edef3574a00c08"},
+ {file = "msgpack-1.0.4-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:fcb8a47f43acc113e24e910399376f7277cf8508b27e5b88499f053de6b115a8"},
+ {file = "msgpack-1.0.4-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:76ee788122de3a68a02ed6f3a16bbcd97bc7c2e39bd4d94be2f1821e7c4a64e6"},
+ {file = "msgpack-1.0.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:0a68d3ac0104e2d3510de90a1091720157c319ceeb90d74f7b5295a6bee51bae"},
+ {file = "msgpack-1.0.4-cp36-cp36m-win32.whl", hash = "sha256:85f279d88d8e833ec015650fd15ae5eddce0791e1e8a59165318f371158efec6"},
+ {file = "msgpack-1.0.4-cp36-cp36m-win_amd64.whl", hash = "sha256:c1683841cd4fa45ac427c18854c3ec3cd9b681694caf5bff04edb9387602d661"},
+ {file = "msgpack-1.0.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a75dfb03f8b06f4ab093dafe3ddcc2d633259e6c3f74bb1b01996f5d8aa5868c"},
+ {file = "msgpack-1.0.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9667bdfdf523c40d2511f0e98a6c9d3603be6b371ae9a238b7ef2dc4e7a427b0"},
+ {file = "msgpack-1.0.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11184bc7e56fd74c00ead4f9cc9a3091d62ecb96e97653add7a879a14b003227"},
+ {file = "msgpack-1.0.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ac5bd7901487c4a1dd51a8c58f2632b15d838d07ceedaa5e4c080f7190925bff"},
+ {file = "msgpack-1.0.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1e91d641d2bfe91ba4c52039adc5bccf27c335356055825c7f88742c8bb900dd"},
+ {file = "msgpack-1.0.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2a2df1b55a78eb5f5b7d2a4bb221cd8363913830145fad05374a80bf0877cb1e"},
+ {file = "msgpack-1.0.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:545e3cf0cf74f3e48b470f68ed19551ae6f9722814ea969305794645da091236"},
+ {file = "msgpack-1.0.4-cp37-cp37m-win32.whl", hash = "sha256:2cc5ca2712ac0003bcb625c96368fd08a0f86bbc1a5578802512d87bc592fe44"},
+ {file = "msgpack-1.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:eba96145051ccec0ec86611fe9cf693ce55f2a3ce89c06ed307de0e085730ec1"},
+ {file = "msgpack-1.0.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7760f85956c415578c17edb39eed99f9181a48375b0d4a94076d84148cf67b2d"},
+ {file = "msgpack-1.0.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:449e57cc1ff18d3b444eb554e44613cffcccb32805d16726a5494038c3b93dab"},
+ {file = "msgpack-1.0.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d603de2b8d2ea3f3bcb2efe286849aa7a81531abc52d8454da12f46235092bcb"},
+ {file = "msgpack-1.0.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48f5d88c99f64c456413d74a975bd605a9b0526293218a3b77220a2c15458ba9"},
+ {file = "msgpack-1.0.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6916c78f33602ecf0509cc40379271ba0f9ab572b066bd4bdafd7434dee4bc6e"},
+ {file = "msgpack-1.0.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:81fc7ba725464651190b196f3cd848e8553d4d510114a954681fd0b9c479d7e1"},
+ {file = "msgpack-1.0.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d5b5b962221fa2c5d3a7f8133f9abffc114fe218eb4365e40f17732ade576c8e"},
+ {file = "msgpack-1.0.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:77ccd2af37f3db0ea59fb280fa2165bf1b096510ba9fe0cc2bf8fa92a22fdb43"},
+ {file = "msgpack-1.0.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b17be2478b622939e39b816e0aa8242611cc8d3583d1cd8ec31b249f04623243"},
+ {file = "msgpack-1.0.4-cp38-cp38-win32.whl", hash = "sha256:2bb8cdf50dd623392fa75525cce44a65a12a00c98e1e37bf0fb08ddce2ff60d2"},
+ {file = "msgpack-1.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:26b8feaca40a90cbe031b03d82b2898bf560027160d3eae1423f4a67654ec5d6"},
+ {file = "msgpack-1.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:462497af5fd4e0edbb1559c352ad84f6c577ffbbb708566a0abaaa84acd9f3ae"},
+ {file = "msgpack-1.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2999623886c5c02deefe156e8f869c3b0aaeba14bfc50aa2486a0415178fce55"},
+ {file = "msgpack-1.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f0029245c51fd9473dc1aede1160b0a29f4a912e6b1dd353fa6d317085b219da"},
+ {file = "msgpack-1.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed6f7b854a823ea44cf94919ba3f727e230da29feb4a99711433f25800cf747f"},
+ {file = "msgpack-1.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0df96d6eaf45ceca04b3f3b4b111b86b33785683d682c655063ef8057d61fd92"},
+ {file = "msgpack-1.0.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6a4192b1ab40f8dca3f2877b70e63799d95c62c068c84dc028b40a6cb03ccd0f"},
+ {file = "msgpack-1.0.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0e3590f9fb9f7fbc36df366267870e77269c03172d086fa76bb4eba8b2b46624"},
+ {file = "msgpack-1.0.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:1576bd97527a93c44fa856770197dec00d223b0b9f36ef03f65bac60197cedf8"},
+ {file = "msgpack-1.0.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:63e29d6e8c9ca22b21846234913c3466b7e4ee6e422f205a2988083de3b08cae"},
+ {file = "msgpack-1.0.4-cp39-cp39-win32.whl", hash = "sha256:fb62ea4b62bfcb0b380d5680f9a4b3f9a2d166d9394e9bbd9666c0ee09a3645c"},
+ {file = "msgpack-1.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:4d5834a2a48965a349da1c5a79760d94a1a0172fbb5ab6b5b33cbf8447e109ce"},
+ {file = "msgpack-1.0.4.tar.gz", hash = "sha256:f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f"},
]
nodeenv = [
{file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"},
@@ -1513,8 +1191,6 @@ pyparsing = [
{file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
]
pytest = [
- {file = "pytest-4.6.11-py2.py3-none-any.whl", hash = "sha256:a00a7d79cbbdfa9d21e7d0298392a8dd4123316bfac545075e6f8f24c94d8c97"},
- {file = "pytest-4.6.11.tar.gz", hash = "sha256:50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"},
{file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"},
{file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"},
{file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
@@ -1578,43 +1254,20 @@ requests-toolbelt = [
{file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"},
{file = "requests_toolbelt-0.9.1-py2.py3-none-any.whl", hash = "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f"},
]
-scandir = [
- {file = "scandir-1.10.0-cp27-cp27m-win32.whl", hash = "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188"},
- {file = "scandir-1.10.0-cp27-cp27m-win_amd64.whl", hash = "sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"},
- {file = "scandir-1.10.0-cp34-cp34m-win32.whl", hash = "sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f"},
- {file = "scandir-1.10.0-cp34-cp34m-win_amd64.whl", hash = "sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e"},
- {file = "scandir-1.10.0-cp35-cp35m-win32.whl", hash = "sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f"},
- {file = "scandir-1.10.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32"},
- {file = "scandir-1.10.0-cp36-cp36m-win32.whl", hash = "sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022"},
- {file = "scandir-1.10.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4"},
- {file = "scandir-1.10.0-cp37-cp37m-win32.whl", hash = "sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173"},
- {file = "scandir-1.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d"},
- {file = "scandir-1.10.0.tar.gz", hash = "sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae"},
-]
secretstorage = [
- {file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"},
{file = "SecretStorage-3.2.0-py3-none-any.whl", hash = "sha256:ed5279d788af258e4676fa26b6efb6d335a31f1f9f529b6f1e200f388fac33e1"},
{file = "SecretStorage-3.2.0.tar.gz", hash = "sha256:46305c3847ee3f7252b284e0eee5590fa6341c891104a2fd2313f8798c615a82"},
- {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"},
- {file = "SecretStorage-3.3.1.tar.gz", hash = "sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195"},
+ {file = "SecretStorage-3.3.2-py3-none-any.whl", hash = "sha256:755dc845b6ad76dcbcbc07ea3da75ae54bb1ea529eb72d15f83d26499a5df319"},
+ {file = "SecretStorage-3.3.2.tar.gz", hash = "sha256:0a8eb9645b320881c222e827c26f4cfcf55363e8b374a021981ef886657a912f"},
]
shellingham = [
{file = "shellingham-1.4.0-py2.py3-none-any.whl", hash = "sha256:536b67a0697f2e4af32ab176c00a50ac2899c5a05e0d8e2dadac8e58888283f9"},
{file = "shellingham-1.4.0.tar.gz", hash = "sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e"},
]
-singledispatch = [
- {file = "singledispatch-3.7.0-py2.py3-none-any.whl", hash = "sha256:bc77afa97c8a22596d6d4fc20f1b7bdd2b86edc2a65a4262bdd7cc3cc19aa989"},
- {file = "singledispatch-3.7.0.tar.gz", hash = "sha256:c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092"},
-]
six = [
{file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
{file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
]
-subprocess32 = [
- {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"},
- {file = "subprocess32-3.5.4-cp27-cp27mu-manylinux2014_x86_64.whl", hash = "sha256:e45d985aef903c5b7444d34350b05da91a9e0ea015415ab45a21212786c649d0"},
- {file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"},
-]
termcolor = [
{file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"},
]
@@ -1627,13 +1280,8 @@ tomlkit = [
{file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"},
]
tox = [
- {file = "tox-3.24.5-py2.py3-none-any.whl", hash = "sha256:be3362472a33094bce26727f5f771ca0facf6dafa217f65875314e9a6600c95c"},
- {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
-]
-typing = [
- {file = "typing-3.10.0.0-py2-none-any.whl", hash = "sha256:c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"},
- {file = "typing-3.10.0.0-py3-none-any.whl", hash = "sha256:12fbdfbe7d6cca1a42e485229afcb0b0c8259258cfb919b8a5e2a5c953742f89"},
- {file = "typing-3.10.0.0.tar.gz", hash = "sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"},
+ {file = "tox-3.25.0-py2.py3-none-any.whl", hash = "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a"},
+ {file = "tox-3.25.0.tar.gz", hash = "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160"},
]
typing-extensions = [
{file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
@@ -1641,12 +1289,12 @@ typing-extensions = [
{file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
]
urllib3 = [
- {file = "urllib3-1.25.11-py2.py3-none-any.whl", hash = "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"},
- {file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"},
+ {file = "urllib3-1.26.9-py2.py3-none-any.whl", hash = "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"},
+ {file = "urllib3-1.26.9.tar.gz", hash = "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"},
]
virtualenv = [
- {file = "virtualenv-20.14.0-py2.py3-none-any.whl", hash = "sha256:1e8588f35e8b42c6ec6841a13c5e88239de1e6e4e4cedfd3916b306dc826ec66"},
- {file = "virtualenv-20.14.0.tar.gz", hash = "sha256:8e5b402037287126e81ccde9432b95a8be5b19d36584f64957060a3488c11ca8"},
+ {file = "virtualenv-20.14.1-py2.py3-none-any.whl", hash = "sha256:e617f16e25b42eb4f6e74096b9c9e37713cf10bf30168fb4a739f3fa8f898a3a"},
+ {file = "virtualenv-20.14.1.tar.gz", hash = "sha256:ef589a79795589aada0c1c5b319486797c03b67ac3984c48c669c0e4f50df3a5"},
]
wcwidth = [
{file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
index 4fff27d4e0eb..63d1fc11af66 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
@@ -22,7 +22,7 @@ classifiers = [
# Requirements
[tool.poetry.dependencies]
-python = "~2.7 || ^3.5"
+python = "^3.5"
poetry-core = "~1.0.7"
cleo = "^0.8.1"
@@ -74,11 +74,11 @@ pytest-mock = "^1.9"
pre-commit = { version = "^2.6", python = "^3.6.1" }
tox = "^3.0"
pytest-sugar = "^0.9.2"
-httpretty = "^0.9.6"
+httpretty = "^1.0.3"
# We need to restrict the version of urllib3 to avoid
# httpretty breaking. This is fixed in httpretty >= 1.0.3
# but it's not compatible with Python 2.7 and 3.5.
-urllib3 = "~1.25.10"
+urllib3 = "~1.26.9"
[tool.poetry.scripts]
poetry = "poetry.console:main"
diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix
new file mode 100644
index 000000000000..d9de20bcf447
--- /dev/null
+++ b/pkgs/misc/rkdeveloptool-pine64/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchurl
+, meson
+, pkg-config
+, libusb1
+, scdoc
+, ninja
+, cmake
+}:
+
+let
+ rev = "cce7d2a5c4efd4e7727c440868141229354b327b";
+in
+stdenv.mkDerivation {
+ pname = "rkdeveloptool";
+ version = "unstable-2021-09-04";
+
+ src = fetchurl {
+ url = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/-/archive/${rev}/rkdeveloptool-${rev}.tar.gz";
+ sha256 = "sha256-u/x1Y1zZ19SYwNLVAvpqjH247RijyDJ1HTDWIsmqlFk=";
+ };
+
+ postPatch = ''
+ substituteInPlace meson.build --replace \
+ "udev_rules_dir = udev.get_pkgconfig_variable('udevdir') + '/rules.d'" \
+ "udev_rules_dir = '$out/lib/udev'"
+ '';
+
+ nativeBuildInputs = [ meson ninja cmake pkg-config scdoc ];
+
+ buildInputs = [ libusb1 ];
+
+ meta =
+ let
+ inherit (lib) maintainers;
+ in
+ {
+ homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/";
+ description = "A tool from Rockchip to communicate with Rockusb devices (pine64 fork)";
+ license = lib.licenses.gpl2;
+ maintainers = [ maintainers.adisbladis ];
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index 6cd542c10726..0e9a632ddb56 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
- modDirVersion = "5.18.0-zen1";
+ modDirVersion = "5.18.1-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@@ -20,11 +20,14 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
inherit rev;
- sha256 = "sha256-A0QrY1REbRODnHtmyNqVaiLhDgYCECevfHZCxtoQ9kU=";
+ sha256 = "sha256-LCLfLE85NifuskYl2dxLOJEsUNHLegF8ecYyU4xOCtY=";
};
structuredExtraConfig = with lib.kernel; {
ZEN_INTERACTIVE = yes;
+ # TODO: Remove once #175433 reaches master
+ # https://nixpk.gs/pr-tracker.html?pr=175433
+ WERROR = no;
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix
index 47d7aa4a4dc6..3aae58933c8f 100644
--- a/pkgs/os-specific/linux/virtualbox/default.nix
+++ b/pkgs/os-specific/linux/virtualbox/default.nix
@@ -19,6 +19,5 @@ stdenv.mkDerivation {
meta = virtualbox.meta // {
description = virtualbox.meta.description + " (kernel modules)";
- broken = kernel.kernelAtLeast "5.18";
};
}
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 6dfe291746b0..4d0ac7ef3ef1 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
- version = "7.17.1";
+ version = "7.18.1";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
- sha256 = "sha256-TFtWuJR/t3MMbs8Gd818ByOnMtiT4QxbcpgBxYXzFYY=";
+ sha256 = "sha256-MEq1ASnJUYWPvt7Z30+fUTv+QrDI+Xsb5e9K0c8ZtdQ=";
};
buildPhase = ''
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 53f7cc265f23..e99a68e1fe5d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2022.6.1";
+ version = "2022.6.2";
components = {
"abode" = ps: with ps; [
abodepy
@@ -1386,7 +1386,8 @@
pykulersky
];
"kwb" = ps: with ps; [
- ]; # missing inputs: pykwb
+ pykwb
+ ];
"lacrosse" = ps: with ps; [
pylacrosse
];
@@ -1514,7 +1515,8 @@
];
"mailgun" = ps: with ps; [
aiohttp-cors
- ]; # missing inputs: pymailgunner
+ pymailgunner
+ ];
"manual" = ps: with ps; [
];
"manual_mqtt" = ps: with ps; [
@@ -1568,7 +1570,8 @@
aiohttp-cors
];
"message_bird" = ps: with ps; [
- ]; # missing inputs: messagebird
+ messagebird
+ ];
"met" = ps: with ps; [
pymetno
];
@@ -3512,6 +3515,7 @@
"lutron_caseta"
"lyric"
"mailbox"
+ "mailgun"
"manual"
"manual_mqtt"
"maxcube"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 2ce6bb1cd1c9..f5664a3b385e 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -166,7 +166,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2022.6.1";
+ hassVersion = "2022.6.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-6QVyJ0f1yeeXRhnEs0kdgwR9LI3waIJczCVfRMG0MHE=";
+ hash = "sha256-M0wBvAdvoGrvJrE96ZM9+X1KMp796vtzbzIo8ScXcy8=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix
index 01340df5e9a1..773801eca17e 100644
--- a/pkgs/shells/yash/default.nix
+++ b/pkgs/shells/yash/default.nix
@@ -6,15 +6,15 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://osdn.net/dl/yash/yash-${version}.tar.xz";
- sha256 = "sha256:1jdmj4cyzwxxyyqf20y1zi578h7md860ryffp02qi143zpppn4sm";
+ hash = "sha256-VRN77/2DhIgFuM75DAxq9UB0SvzBA+Gw973z7xmRtck=";
};
strictDeps = true;
buildInputs = [ gettext ncurses ];
meta = with lib; {
- description = "Yet another POSIX-compliant shell";
homepage = "https://yash.osdn.jp/index.html.en";
+ description = "Yet another POSIX-compliant shell";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qbit ];
platforms = platforms.all;
diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix
index c5a9e24abd43..eeb3d6fcb520 100644
--- a/pkgs/test/cuda/cuda-samples/generic.nix
+++ b/pkgs/test/cuda/cuda-samples/generic.nix
@@ -1,20 +1,16 @@
-{ addOpenGLRunpath
-, cudatoolkit
+{ lib
+, stdenv
, fetchFromGitHub
, fetchpatch
-, lib
+, addOpenGLRunpath
+, cudatoolkit
, pkg-config
, sha256
-, stdenv
}:
-let
+stdenv.mkDerivation rec {
pname = "cuda-samples";
version = lib.versions.majorMinor cudatoolkit.version;
-in
-
-stdenv.mkDerivation {
- inherit pname version;
src = fetchFromGitHub {
owner = "NVIDIA";
@@ -31,7 +27,7 @@ stdenv.mkDerivation {
patches = lib.optionals (version == "11.3") [
(fetchpatch {
url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch";
- sha256 = "sha256:15bydf59scmfnldz5yawbjacdxafi50ahgpzq93zlc5xsac5sz6i";
+ sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU=";
})
];
diff --git a/pkgs/test/dhall/buildDhallUrl/default.nix b/pkgs/test/dhall/buildDhallUrl/default.nix
index d2e214fb9770..a75101a303d6 100644
--- a/pkgs/test/dhall/buildDhallUrl/default.nix
+++ b/pkgs/test/dhall/buildDhallUrl/default.nix
@@ -9,6 +9,6 @@
dhallPackages.buildDhallUrl {
url = "https://raw.githubusercontent.com/cdepillabout/example-dhall-nix/e6a675c72ecd4dd23d254a02aea8181fe875747f/mydhallfile.dhall";
hash = "sha256-434x+QjHRzuprBdw0h6wmwB1Zj6yZqQb533me8XdO4c=";
- dhallHash = "sha256:e37e31f908c7473ba9ac1770d21eb09b0075663eb266a41be77de67bc5dd3b87";
+ dhallHash = "sha256-434x+QjHRzuprBdw0h6wmwB1Zj6yZqQb533me8XdO4c=";
source = true;
}
diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix
index ae1aab2ad092..e8ebbee66056 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.34";
+ version = "2.34.1";
src = fetchFromGitHub {
owner = "tyrrrz";
repo = "discordchatexporter";
rev = version;
- sha256 = "EHpnLUFHR+FC1qlwW0TuLas9aA/CMELHkzbLlNyiwgE=";
+ sha256 = "U+AwxHvyLD2BwrJH3h0yKKHBsgBM/D657TuG9IgllPs=";
};
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix
index ecc872877763..bdc388c18270 100644
--- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix
+++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix
@@ -1,5 +1,5 @@
{ fetchNuGet }: [
- (fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; })
+ (fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; })
(fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; })
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
(fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; })
diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix
index 10ea061f8608..53841f684208 100644
--- a/pkgs/tools/filesystems/goofys/default.nix
+++ b/pkgs/tools/filesystems/goofys/default.nix
@@ -6,17 +6,17 @@
buildGoModule {
pname = "goofys";
- version = "unstable-2021-03-26";
+ version = "unstable-2022-04-21";
src = fetchFromGitHub {
owner = "kahing";
repo = "goofys";
# Same as v0.24.0 but migrated to Go modules
- rev = "0c993271269b539196330a18716a33fbeeebd624";
- sha256 = "18is5sv2a9wmsm0qpakly988z1qyl2b2hf2105lpxrgl659sf14p";
+ rev = "829d8e5ce20faa3f9f6f054077a14325e00e9249";
+ sha256 = "sha256-6yVMNSwwPZlADXuPBDRlgoz4Stuz2pgv6r6+y2/C8XY=";
};
- vendorSha256 = "15yq0msh9icxd5n2zkkqrlwxifizhpa99d4aznv8clg32ybs61fj";
+ vendorSha256 = "sha256-2N8MshBo9+2q8K00eTW5So6d8ZNRzOfQkEKmxR428gI=";
subPackages = [ "." ];
@@ -30,8 +30,7 @@ buildGoModule {
description = "A high-performance, POSIX-ish Amazon S3 file system written in Go.";
license = [ lib.licenses.mit ];
maintainers = [ lib.maintainers.adisbladis ];
- # does not build with go 1.17
- broken = true;
+ broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
};
}
diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix
index 09be33384d50..010aeaefabf3 100644
--- a/pkgs/tools/filesystems/ifuse/default.nix
+++ b/pkgs/tools/filesystems/ifuse/default.nix
@@ -1,17 +1,34 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, fuse, libimobiledevice }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, fuse
+, usbmuxd
+, libimobiledevice
+}:
stdenv.mkDerivation rec {
pname = "ifuse";
- version = "1.1.4";
+ version = "1.1.4+date=2022-04-04";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "1r12y3h1j7ikkwk874h9969kr4ksyamvrwywx19ml6rsr01arw84";
+ rev = "6f5b8e410f9615b3369ca5eb5367745e13d83b92";
+ hash = "sha256-KbuJLS2BWua9DnhLv2KtsQObin0PQwXQwEdgi3lSAPk=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config fuse usbmuxd libimobiledevice ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ fuse
+ usbmuxd
+ libimobiledevice
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/ifuse";
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 657d215147ce..eef97b55cca9 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
owner = "vectorgraphics";
repo = pname;
rev = version;
- sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l";
+ hash = "sha256-dMgsKBg6YQ3mdx3jFqjX4vZeizaier8+ZQUl4J6QXNE=";
};
patches =
(lib.optional (lib.versionOlder version "2.68")
(fetchpatch {
url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
- sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm";
+ hash = "sha256-1RYMZcwbjBAM7aAXFBbwst0eozWYFtJ8HcicjXogS/w=";
}))
;
diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix
index 507fbb7dcc71..4438d9d637ba 100644
--- a/pkgs/tools/misc/flexoptix-app/default.nix
+++ b/pkgs/tools/misc/flexoptix-app/default.nix
@@ -6,12 +6,12 @@
src = fetchurl {
name = "${name}.AppImage";
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
- sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin";
+ hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM=";
};
udevRules = fetchurl {
url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules";
- sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr";
+ hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc=";
};
appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: {
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix
index f25c2eb62f6b..13cb6584f0a3 100644
--- a/pkgs/tools/misc/ideviceinstaller/default.nix
+++ b/pkgs/tools/misc/ideviceinstaller/default.nix
@@ -1,17 +1,34 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, libzip, libimobiledevice }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, usbmuxd
+, libimobiledevice
+, libzip
+}:
stdenv.mkDerivation rec {
pname = "ideviceinstaller";
- version = "1.1.1";
+ version = "1.1.1+date=2022-05-09";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "1xp0sjgfx2z19x9mxihn18ybsmrnrcfc55zbh5a44g3vrmagmlzz";
+ rev = "3909271599917bc4a3a996f99bdd3f88c49577fa";
+ hash = "sha256-dw3nda2PNddSFPzcx2lv0Nh1KLFXwPBbDBhhwEaB6d0=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config usbmuxd libimobiledevice libzip ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ usbmuxd
+ libimobiledevice
+ libzip
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/ideviceinstaller";
@@ -21,8 +38,8 @@ stdenv.mkDerivation rec {
of an iOS device allowing to install, upgrade, uninstall, archive, restore
and enumerate installed or archived apps.
'';
- license = licenses.gpl2;
- platforms = platforms.linux ++ platforms.darwin;
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
maintainers = with maintainers; [ aristid infinisil ];
};
}
diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix
index 3e4739ee032a..d874d72ec65d 100644
--- a/pkgs/tools/misc/idevicerestore/default.nix
+++ b/pkgs/tools/misc/idevicerestore/default.nix
@@ -1,23 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
, curl
, libimobiledevice
, libirecovery
, libzip
, libusbmuxd
-, IOKit
}:
stdenv.mkDerivation rec {
pname = "idevicerestore";
- version = "1.0.0";
+ version = "1.0.0+date=2022-05-22";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = version;
- sha256 = "1w7ywp77xc6v4hifi3j9ywrj447vv7fkwg2w26w0lq95f3bkblqr";
+ rev = "f80a876b3598de4eb551bafcb279947c527fae33";
+ hash = "sha256-I9zZQcZFd0hfeEJM7jltJtVJ6V5C5rA/S8gINiCnJdY=";
};
+ postPatch = ''
+ echo '${version}' > .tarball-version
+ '';
+
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -32,7 +39,7 @@ stdenv.mkDerivation rec {
# Not listing other dependencies specified in
# https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
# because they are inherited `libimobiledevice`.
- ] ++ lib.optionals stdenv.isDarwin [ IOKit ];
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/idevicerestore";
@@ -52,8 +59,7 @@ stdenv.mkDerivation rec {
This will download and restore a device to the latest firmware available.
'';
license = licenses.lgpl21Plus;
- # configure.ac suggests it should work for mingw as well but not tried yet
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
maintainers = with maintainers; [ nh2 ];
};
}
diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix
index e0cf9d98d651..3d2d2919aa56 100644
--- a/pkgs/tools/misc/octofetch/default.nix
+++ b/pkgs/tools/misc/octofetch/default.nix
@@ -1,9 +1,9 @@
{ lib
, stdenv
, fetchFromGitHub
-, rustPlatform
-, pkg-config
, openssl
+, pkg-config
+, rustPlatform
, Security
}:
@@ -18,15 +18,16 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
};
- cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a";
+ cargoSha256 = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU=";
nativeBuildInputs = [ pkg-config ];
+
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
- description = "Github user information on terminal";
homepage = "https://github.com/azur1s/octofetch";
+ description = "Github user information on terminal";
license = licenses.mit;
maintainers = with maintainers; [ jyooru ];
};
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index c1abe01be565..851179c8d874 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, fetchurl, lib, makeWrapper
-, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
, kconfig, kcrash, kinit, kpmcore, polkit-qt
, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux
, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs
@@ -48,13 +48,16 @@ in mkDerivation rec {
hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo=";
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ];
- postFixup = ''
- wrapProgram $out/bin/partitionmanager \
+ dontWrapGApps = true;
+ preFixup = ''
+ qtWrapperArgs+=(
+ "''${gappsWrapperArgs[@]}"
--prefix PATH : "${runtimeDeps}"
+ )
'';
meta = with lib; {
diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/tools/misc/precice-config-visualizer/default.nix
index 7605f49b1535..be6e7f0a9bb6 100644
--- a/pkgs/tools/misc/precice-config-visualizer/default.nix
+++ b/pkgs/tools/misc/precice-config-visualizer/default.nix
@@ -1,4 +1,7 @@
-{ lib, python3Packages, fetchFromGitHub}:
+{ lib
+, python3Packages
+, fetchFromGitHub
+}:
python3Packages.buildPythonApplication rec {
pname = "config-visualizer";
@@ -8,15 +11,16 @@ python3Packages.buildPythonApplication rec {
owner = "precice";
repo = pname;
rev = "60f2165f25352c8261f370dc4ceb64a8b422d4ec";
- sha256 = "sha256:0mqzp2qdvbqbxaczlvc9xxxdz6hclraznbmc08ldx11xwy8yknfr";
+ hash = "sha256-2dnpkec9hN4oAqwu+1WmDJrfeu+JbfqZ6guv3bC4H1c=";
};
propagatedBuildInputs = with python3Packages; [ lxml pydot ];
+
doCheck = false;
meta = with lib; {
- description = "Small python tool for visualizing the preCICE xml configuration ";
homepage = "https://github.com/precice/config-visualizer";
+ description = "Small python tool for visualizing the preCICE xml configuration ";
license = licenses.gpl3Only;
maintainers = with maintainers; [ Scriptkiddi ];
};
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index 96b82a8a20a2..624c818c1f72 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -1,23 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1, libimobiledevice }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libimobiledevice
+, libusb1
+}:
stdenv.mkDerivation rec {
pname = "usbmuxd";
- version = "unstable-2021-05-08";
+ version = "1.1.1+date=2022-04-04";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
- rev = "5e484e18f1383b5a0bd6c353ab1d668b03e4ffab";
- sha256 = "sha256-hhbfRmLEhVVuJNnw65PakPnvjSCrN3oSMK6D7Zwnw60=";
+ rev = "2839789bdb581ede7c331b9b4e07e0d5a89d7d18";
+ hash = "sha256-wYW6hI0Ti9gKtk/wxIbdY5KaPMs/p+Ve9ceeRqXihQI=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- propagatedBuildInputs = [ libimobiledevice libusb1 ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
- preConfigure = ''
- configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d"
- configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system"
- '';
+ propagatedBuildInputs = [
+ libimobiledevice
+ libusb1
+ ];
+
+ configureFlags = [
+ "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
+ "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/usbmuxd";
@@ -32,7 +46,7 @@ stdenv.mkDerivation rec {
in parallel. The higher-level layers are handled by libimobiledevice.
'';
license = licenses.gpl2Plus;
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.unix;
maintainers = with maintainers; [ infinisil ];
};
}
diff --git a/pkgs/tools/networking/openapi-generator-cli/example.nix b/pkgs/tools/networking/openapi-generator-cli/example.nix
index f59173b9744a..047c02a9a912 100644
--- a/pkgs/tools/networking/openapi-generator-cli/example.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/example.nix
@@ -4,7 +4,7 @@ runCommand "openapi-generator-cli-test" {
nativeBuildInputs = [ openapi-generator-cli ];
petstore = fetchurl {
url = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/14c0908becbccd78252be49bd92be8c53cd2b9e3/examples/v3.0/petstore.yaml";
- sha256 = "sha256:1mgdbzv42alv0b1a18dqbabqyvyhrg3brynr5hqsrm3qljfzaq5b";
+ hash = "sha256-q2D1naR41KwxLNn6vMbL0G+Pl1q4oaDCApsqQfZf7dU=";
};
config = builtins.toJSON {
elmVersion = "0.19";
diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix
index f0d5991d34bc..a3b6b0f738ab 100644
--- a/pkgs/tools/networking/vpnc-scripts/default.nix
+++ b/pkgs/tools/networking/vpnc-scripts/default.nix
@@ -1,15 +1,24 @@
-{ lib, stdenv, fetchgit
+{ lib
+, stdenv
+, fetchgit
+, coreutils
+, gawk
+, gnugrep
+, iproute2
, makeWrapper
-, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2
+, nettools
+, openresolv
+, systemd
}:
stdenv.mkDerivation {
pname = "vpnc-scripts";
version = "unstable-2021-09-24";
+
src = fetchgit {
url = "https://gitlab.com/openconnect/vpnc-scripts.git";
rev = "b749c2cadc2f32e2efffa69302861f9a7d4a4e5f";
- sha256 = "sha256:19aj6mfkclbkx6ycyd4xm7id1bq78ismw0y6z23f6s016k3sjc8c";
+ sha256 = "sha256-DDGpxzQBaOOG+MYDXnVEB6/Q4qmdNM+86XNRNl01UqU=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -32,8 +41,8 @@ stdenv.mkDerivation {
'';
meta = with lib; {
- description = "script for vpnc to configure the network routing and name service";
homepage = "https://www.infradead.org/openconnect/";
+ description = "Script for vpnc to configure the network routing and name service";
license = licenses.gpl2Only;
maintainers = with maintainers; [ jerith666 ];
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 40bab69b763a..8847f5aeca43 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+}:
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2022-05-26";
+ version = "2022-06-04";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-yLbPgU8BAAcXZtG4fIo6oVtD1tRBlGgNeFglyGJ8Uhk=";
+ hash = "sha256-FJg87YWGKZxGgwr14Z+FAIWzgiZR63sFBn4+CpMyQUs=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [
+ makeWrapper
+ ];
installPhase = ''
runHook preInstall
@@ -25,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/offensive-security/exploitdb";
description = "Archive of public exploits and corresponding vulnerable software";
license = with licenses; [ gpl2Plus gpl3Plus mit ];
- maintainers = with maintainers; [ applePrincess ];
+ maintainers = with maintainers; [ applePrincess fab ];
mainProgram = "searchsploit";
};
}
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index 9569472f2f54..b48dec714926 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
- version = "8.8.6";
+ version = "8.8.7";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o5pV3+ndMsXsXY21l9CfZQp1nhMsLddBKaf9fTQbw5k=";
+ sha256 = "sha256-C4AbxE37kqO3FJR/J7wP7WcV/mzzLZxPLBku5qgCxV4=";
};
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index db3ddd167a60..bcc7163bec2f 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2";
- sha256 = "sha256:024x0hadn0kc0m9yz3l2pqzc5mdqyza9lmckg0bn4xak6frzkqwy";
+ hash = "sha256-nuP5szNTdWIXeJNVmtT3uNXCPr6Cju9TBWwC2xQEnQg=";
};
patches = [ ./no-dropdir-literals.patch ];
diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix
index 7dc7e3a7a903..9463e0851898 100644
--- a/pkgs/tools/security/pomerium-cli/default.nix
+++ b/pkgs/tools/security/pomerium-cli/default.nix
@@ -9,15 +9,17 @@ let
in
buildGoModule rec {
pname = "pomerium-cli";
- version = pomerium.version;
+ inherit (pomerium) version;
+
src = fetchFromGitHub {
owner = "pomerium";
repo = "cli";
rev = "v${version}";
- hash = "sha256:0230b22xjnpykj8bcdahzzlsvlrd63z2cmg6yb246c5ngjs835q1";
+ hash = "sha256-AZeBtHy2MEPE8uZVJv4wLdOt6f9QNbaQnP5a2YVYYAg=";
};
- vendorSha256 = "sha256:0xx22lmh6wip1d1bjrp4lgab3q9yilw54v4lg24lf3xhbsr5si9b";
+ vendorSha256 = "sha256-K0Vdsl6wD0eJeJRsUjiNPuGx1KPkZrlCCzdyAysVonc=";
+
subPackages = [
"cmd/pomerium-cli"
];
@@ -45,7 +47,11 @@ buildGoModule rec {
];
installPhase = ''
+ runHook preInstall
+
install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 873cfdbbb056..b218a3241f9f 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
- hash = "sha256:1wkmyi6n3z2pak1cj5yk6v6bv9w0m24skycya48iikab0mrr8931";
+ hash = "sha256-YSSUcwVLzRgRUZ75qYmogKe9zDbTF8nCVFf8YU30dfI=";
};
configureFlags = [
diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/tools/system/retry/default.nix
index 48125d2df37e..2dcd1aa37660 100644
--- a/pkgs/tools/system/retry/default.nix
+++ b/pkgs/tools/system/retry/default.nix
@@ -1,23 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, which, txt2man }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, txt2man
+, which
+}:
+
stdenv.mkDerivation rec {
pname = "retry";
version = "1.0.4";
- nativeBuildInputs = [ autoreconfHook which txt2man ];
-
src = fetchFromGitHub {
owner = "minfrin";
repo = "retry";
rev = "${pname}-${version}";
- sha256 = "sha256:0jrx4yrwlf4fn3309kxraj7zgwk7gq6rz5ibswq3w3b3jfvxi8qb";
+ hash = "sha256-C6PYt5NjDT4w1yuWnw1+Z/L3j1S5zwTGsI44yrMnPUs=";
};
+ nativeBuildInputs = [ autoreconfHook txt2man which ];
+
meta = with lib; {
homepage = "https://github.com/minfrin/retry";
description = "Retry a command until the command succeeds";
- platforms = platforms.all;
license = licenses.asl20;
maintainers = with maintainers; [ gfrascadorio ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix
index 5bb821afdaf1..965813f6e371 100644
--- a/pkgs/tools/system/runitor/default.nix
+++ b/pkgs/tools/system/runitor/default.nix
@@ -1,29 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, runitor }:
buildGoModule rec {
pname = "runitor";
- version = "0.9.2";
+ version = "0.10.0";
vendorSha256 = null;
src = fetchFromGitHub {
owner = "bdd";
repo = "runitor";
rev = "v${version}";
- sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4";
+ sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw=";
};
ldflags = [
- "-s" "-w" "-X main.Version=v${version}"
+ "-s" "-X main.Version=v${version}"
];
- # TODO(cole-h):
- # End-to-end tests requiring localhost networking currently under
- # OfBorg's Linux builders, while passing under Darwin.
- #
- # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891
- #
- # Temporarily disable tests.
- doCheck = false;
+ patches = [
+ (fetchpatch {
+ name = "backport_TestPostRetries-timeout-fix.patch";
+ url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch";
+ sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg=";
+ })
+ ];
passthru.tests.version = testers.testVersion {
package = runitor;
diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix
index cfbfee48938a..c636eef3c46e 100644
--- a/pkgs/tools/text/cidrgrep/default.nix
+++ b/pkgs/tools/text/cidrgrep/default.nix
@@ -8,10 +8,10 @@ buildGoModule {
owner = "tomdoherty";
repo = "cidrgrep";
rev = "8ad5af533e8dc33ea18ff19b7c6a41550748fe0e";
- sha256 = "sha256:0jvwm9jq5jd270b6l9nkvc5pr3rgf158sw83lrprmwmz7r4mr786";
+ hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs=";
};
- vendorSha256 = "sha256:0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+ vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
postInstall = ''
mv $out/bin/cmd $out/bin/cidrgrep
@@ -19,7 +19,7 @@ buildGoModule {
meta = {
description = "Like grep but for IPv4 CIDRs";
- maintainers = with lib.maintainers; [ das_j ];
license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ das_j ];
};
}
diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix
index 924eea3c0a86..267309e2e35b 100644
--- a/pkgs/tools/typesetting/coq2html/default.nix
+++ b/pkgs/tools/typesetting/coq2html/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "xavierleroy";
repo = "coq2html";
rev = "v${version}";
- sha256 = "sha256:1ad825yifn518wk1c2y2ji10q3m468r8ajjgw2nzzy7d608nx7yq";
+ hash = "sha256-2J9uETDt+P+t4E9KhTIypA4MQpTCCxYmR6FYF30RqKk=";
};
nativeBuildInputs = [ ocaml ];
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 4ab4ae7c0f2e..565b0345e50a 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -59,19 +59,23 @@ stdenv.mkDerivation rec {
makeWrapper
];
buildInputs = [
+ luaEnv
harfbuzz
icu
fontconfig
libiconv
- luaEnv
]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
;
checkInputs = [
poppler_utils
];
+ passthru = {
+ # So it will be easier to inspect this environment, in comparison to others
+ inherit luaEnv;
+ };
- preConfigure = ''
+ postPatch = ''
patchShebangs build-aux/*.sh
'' + lib.optionalString stdenv.isDarwin ''
sed -i -e 's|@import AppKit;|#import |' src/macfonts.m
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3daa67b1e174..0af6b1584d00 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -128,6 +128,7 @@ mapAliases ({
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24
bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22
bro = zeek; # Added 2019-09-29
+ btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
@@ -826,6 +827,7 @@ mapAliases ({
manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22
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
+ marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04
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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ac0b34ce0ea..f53029cc3643 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7064,9 +7064,7 @@ with pkgs;
ifuse = callPackage ../tools/filesystems/ifuse { };
ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
- idevicerestore = callPackage ../tools/misc/idevicerestore {
- inherit (darwin) IOKit;
- };
+ idevicerestore = callPackage ../tools/misc/idevicerestore { };
inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages.libcxxStdenv;
@@ -18700,7 +18698,11 @@ with pkgs;
libieee1284 = callPackage ../development/libraries/libieee1284 { };
- libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
+ libimobiledevice = callPackage ../development/libraries/libimobiledevice {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation;
+ };
+
+ libimobiledevice-glue = callPackage ../development/libraries/libimobiledevice-glue { };
libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
@@ -25498,8 +25500,6 @@ with pkgs;
bspwm = callPackage ../applications/window-managers/bspwm { };
- btops = callPackage ../applications/window-managers/btops { };
-
bvi = callPackage ../applications/editors/bvi { };
bviplus = callPackage ../applications/editors/bviplus { };
@@ -28015,8 +28015,6 @@ with pkgs;
electron = electron_9;
};
- marp = callPackage ../applications/office/marp { };
-
magnetico = callPackage ../applications/networking/p2p/magnetico { };
mastodon-bot = nodePackages.mastodon-bot;
@@ -29416,6 +29414,8 @@ with pkgs;
rkdeveloptool = callPackage ../misc/rkdeveloptool { };
+ rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { };
+
rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { };
rofi-unwrapped = callPackage ../applications/misc/rofi { };
@@ -31246,6 +31246,8 @@ with pkgs;
lndconnect = callPackage ../applications/blockchains/lndconnect { };
+ lndhub-go = callPackage ../applications/blockchains/lndhub-go { };
+
lndmanage = callPackage ../applications/blockchains/lndmanage { };
monero-cli = callPackage ../applications/blockchains/monero-cli {
@@ -34464,6 +34466,8 @@ with pkgs;
sndio = callPackage ../misc/sndio { };
+ sticky = callPackage ../applications/misc/sticky { };
+
stork = callPackage ../applications/misc/stork { };
oclgrind = callPackage ../development/tools/analysis/oclgrind { };
@@ -34566,7 +34570,7 @@ with pkgs;
runit = callPackage ../tools/system/runit { };
- runitor = callPackage ../tools/system/runitor { };
+ runitor = callPackage ../tools/system/runitor { buildGoModule = buildGo118Module; };
refind = callPackage ../tools/bootloaders/refind { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5f77885e1545..ef3de37f643f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9816,14 +9816,15 @@ let
};
};
- Gtk3 = buildPerlPackage {
+ Gtk3 = buildPerlPackage rec {
pname = "Gtk3";
- version = "0.037";
+ version = "0.038";
src = fetchurl {
- url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.037.tar.gz";
- sha256 = "0l9zis8l9jall1m48mgd5g4f85lsz4hcp22spal8r9wlf9af2nmz";
+ url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-${version}.tar.gz";
+ sha256 = "sha256-cNxL8qp0mBx54V/SmNmY4FqS66SBHxrVyfH03jdzesw=";
};
propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ];
+ preCheck = lib.optionalString stdenv.isDarwin "rm t/overrides.t"; # Currently failing on macOS
meta = {
description = "Perl interface to the 3.x series of the GTK toolkit";
license = lib.licenses.lgpl21Plus;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 307c54fbec31..5e62bda60226 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2887,6 +2887,8 @@ in {
ezdxf = callPackage ../development/python-modules/ezdxf { };
+ f90nml = callPackage ../development/python-modules/f90nml { };
+
Fabric = callPackage ../development/python-modules/Fabric { };
faadelays = callPackage ../development/python-modules/faadelays { };
@@ -5327,6 +5329,8 @@ in {
mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };
+ messagebird = callPackage ../development/python-modules/messagebird { };
+
metakernel = callPackage ../development/python-modules/metakernel { };
metar = callPackage ../development/python-modules/metar { };
@@ -7480,6 +7484,8 @@ in {
pykwalify = callPackage ../development/python-modules/pykwalify { };
+ pykwb = callPackage ../development/python-modules/pykwb { };
+
pylacrosse = callPackage ../development/python-modules/pylacrosse { };
pylama = callPackage ../development/python-modules/pylama { };
@@ -7558,6 +7564,8 @@ in {
pymaging_png = callPackage ../development/python-modules/pymaging_png { };
+ pymailgunner = callPackage ../development/python-modules/pymailgunner { };
+
pymanopt = callPackage ../development/python-modules/pymanopt { };
pymarshal = callPackage ../development/python-modules/pymarshal { };