diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index dc428b533e36..830730caef83 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1538,6 +1538,13 @@
configuration.
+
+
+ A new module was added for the Envoy reverse proxy, providing
+ the options services.envoy.enable and
+ services.envoy.settings.
+
+
The option services.duplicati.dataDir has
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index b8b070bd6cf4..333c2355232d 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -547,6 +547,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
+- A new module was added for the Envoy reverse proxy, providing the options `services.envoy.enable` and `services.envoy.settings`.
+
- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d6c65251c628..1ad2592b1dd7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -753,6 +753,7 @@
./services/networking/ncdns.nix
./services/networking/nomad.nix
./services/networking/ejabberd.nix
+ ./services/networking/envoy.nix
./services/networking/epmd.nix
./services/networking/ergo.nix
./services/networking/ergochat.nix
diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix
new file mode 100644
index 000000000000..b7f859c73d9d
--- /dev/null
+++ b/nixos/modules/services/networking/envoy.nix
@@ -0,0 +1,84 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.envoy;
+ format = pkgs.formats.json { };
+ conf = format.generate "envoy.json" cfg.settings;
+ validateConfig = file:
+ pkgs.runCommand "validate-envoy-conf" { } ''
+ ${pkgs.envoy}/bin/envoy --log-level error --mode validate -c "${file}"
+ cp "${file}" "$out"
+ '';
+
+in
+
+{
+ options.services.envoy = {
+ enable = mkEnableOption "Envoy reverse proxy";
+
+ settings = mkOption {
+ type = format.type;
+ default = { };
+ example = literalExpression ''
+ {
+ admin = {
+ access_log_path = "/dev/null";
+ address = {
+ socket_address = {
+ protocol = "TCP";
+ address = "127.0.0.1";
+ port_value = 9901;
+ };
+ };
+ };
+ static_resources = {
+ listeners = [];
+ clusters = [];
+ };
+ }
+ '';
+ description = ''
+ Specify the configuration for Envoy in Nix.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.envoy ];
+ systemd.services.envoy = {
+ description = "Envoy reverse proxy";
+ after = [ "network-online.target" ];
+ requires = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}";
+ DynamicUser = true;
+ Restart = "no";
+ CacheDirectory = "envoy";
+ LogsDirectory = "envoy";
+ AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+ CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
+ RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK AF_XDP";
+ SystemCallArchitectures = "native";
+ LockPersonality = true;
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE
+ PrivateDevices = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "ptraceable";
+ ProtectHostname = true;
+ ProtectSystem = "strict";
+ UMask = "0066";
+ SystemCallFilter = "~@clock @module @mount @reboot @swap @obsolete @cpu-emulation";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 3bc0dedec00e..fbfc61177d38 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -642,41 +642,14 @@ in
};
scriptArgs = "%i";
- path = [ pkgs.gawk cfgZfs.package ];
+ path = [ cfgZfs.package ];
- # ZFS has no way of enumerating just devices in a pool in a way
- # that 'zpool online -e' supports. Thus, we've implemented a
- # bit of a strange approach of highlighting just devices.
- # See: https://github.com/openzfs/zfs/issues/12505
- script = let
- # This UUID has been chosen at random and is to provide a
- # collision-proof, predictable token to search for
- magicIdentifier = "NIXOS-ZFS-ZPOOL-DEVICE-IDENTIFIER-37108bec-aff6-4b58-9e5e-53c7c9766f05";
- zpoolScripts = pkgs.writeShellScriptBin "device-highlighter" ''
- echo "${magicIdentifier}"
- '';
- in ''
+ script = ''
pool=$1
echo "Expanding all devices for $pool."
- # Put our device-highlighter script it to the PATH
- export ZPOOL_SCRIPTS_PATH=${zpoolScripts}/bin
-
- # Enable running our precisely specified zpool script as root
- export ZPOOL_SCRIPTS_AS_ROOT=1
-
- devices() (
- zpool status -c device-highlighter "$pool" \
- | awk '($2 == "ONLINE" && $6 == "${magicIdentifier}") { print $1; }'
- )
-
- for device in $(devices); do
- echo "Attempting to expand $device of $pool..."
- if ! zpool online -e "$pool" "$device"; then
- echo "Failed to expand '$device' of '$pool'."
- fi
- done
+ ${pkgs.zpool-auto-expand-partitions}/bin/zpool_part_disks --automatically-grow "$pool"
'';
};
@@ -701,8 +674,6 @@ in
RemainAfterExit = true;
};
- path = [ pkgs.gawk cfgZfs.package ];
-
script = ''
for pool in ${poolListProvider}; do
systemctl start --no-block "zpool-expand@$pool"
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 799ce9b4017e..d9429920f13b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -142,6 +142,7 @@ in
engelsystem = handleTest ./engelsystem.nix {};
enlightenment = handleTest ./enlightenment.nix {};
env = handleTest ./env.nix {};
+ envoy = handleTest ./envoy.nix {};
ergo = handleTest ./ergo.nix {};
ergochat = handleTest ./ergochat.nix {};
etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
diff --git a/nixos/tests/envoy.nix b/nixos/tests/envoy.nix
new file mode 100644
index 000000000000..9d2c32ce102f
--- /dev/null
+++ b/nixos/tests/envoy.nix
@@ -0,0 +1,33 @@
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
+ name = "envoy";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ cameronnemo ];
+ };
+
+ nodes.machine = { pkgs, ... }: {
+ services.envoy.enable = true;
+ services.envoy.settings = {
+ admin = {
+ access_log_path = "/dev/null";
+ address = {
+ socket_address = {
+ protocol = "TCP";
+ address = "127.0.0.1";
+ port_value = 9901;
+ };
+ };
+ };
+ static_resources = {
+ listeners = [];
+ clusters = [];
+ };
+ };
+ };
+
+ testScript = ''
+ machine.start()
+ machine.wait_for_unit("envoy.service")
+ machine.wait_for_open_port(9901)
+ machine.wait_until_succeeds("curl -fsS localhost:9901/ready")
+ '';
+})
diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix
index fce8df2b7e3a..267216a5e5a6 100644
--- a/nixos/tests/keycloak.nix
+++ b/nixos/tests/keycloak.nix
@@ -143,7 +143,7 @@ let
# post url.
keycloak.succeed(
"curl -sSf -c cookie '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/auth?client_id=${client.name}&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&scope=openid+email&response_type=code&response_mode=query&nonce=qw4o89g3qqm' >login_form",
- "tidy -q -m login_form || true",
+ "tidy -asxml -q -m login_form || true",
"xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:div/_:form[@id='kc-form-login']\" -v @action login_form >form_post_url",
)
@@ -151,7 +151,7 @@ let
# the HTML, then extract the authorization code.
keycloak.succeed(
"curl -sSf -L -b cookie -d 'username=${user.username}' -d 'password=${password}' -d 'credentialId=' \"$(auth_code_html",
- "tidy -q -m auth_code_html || true",
+ "tidy -asxml -q -m auth_code_html || true",
"xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:input[@id='code']\" -v @value auth_code_html >auth_code",
)
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index bf0165b88162..0b44961a3deb 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -127,4 +127,54 @@ in {
};
installer = (import ./installer.nix { }).zfsroot;
+
+ expand-partitions = makeTest {
+ name = "multi-disk-zfs";
+ nodes = {
+ machine = { pkgs, ... }: {
+ environment.systemPackages = [ pkgs.parted ];
+ boot.supportedFilesystems = [ "zfs" ];
+ networking.hostId = "00000000";
+
+ virtualisation = {
+ emptyDiskImages = [ 20480 20480 20480 20480 20480 20480 ];
+ };
+
+ specialisation.resize.configuration = {
+ services.zfs.expandOnBoot = [ "tank" ];
+ };
+ };
+ };
+
+ testScript = { nodes, ... }:
+ ''
+ start_all()
+ machine.wait_for_unit("default.target")
+ print(machine.succeed('mount'))
+
+ print(machine.succeed('parted --script /dev/vdb -- mklabel gpt'))
+ print(machine.succeed('parted --script /dev/vdb -- mkpart primary 1M 70M'))
+
+ print(machine.succeed('parted --script /dev/vdc -- mklabel gpt'))
+ print(machine.succeed('parted --script /dev/vdc -- mkpart primary 1M 70M'))
+
+ print(machine.succeed('zpool create tank mirror /dev/vdb1 /dev/vdc1 mirror /dev/vdd /dev/vde mirror /dev/vdf /dev/vdg'))
+ print(machine.succeed('zpool list -v'))
+ print(machine.succeed('mount'))
+ start_size = int(machine.succeed('df -k --output=size /tank | tail -n1').strip())
+
+ print(machine.succeed("/run/current-system/specialisation/resize/bin/switch-to-configuration test >&2"))
+ machine.wait_for_unit("zpool-expand-pools.service")
+ machine.wait_for_unit("zpool-expand@tank.service")
+
+ print(machine.succeed('zpool list -v'))
+ new_size = int(machine.succeed('df -k --output=size /tank | tail -n1').strip())
+
+ if (new_size - start_size) > 20000000:
+ print("Disk grew appropriately.")
+ else:
+ print(f"Disk went from {start_size} to {new_size}, which doesn't seem right.")
+ exit(1)
+ '';
+ };
}
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
index 6f438a106ffb..10cbbeb21de0 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
- sha256 = "sha256-kkpb8tLuj4QO+TBW2yNDugS4c6dCQ9Lddv6Z8NS0uio=";
+ sha256 = "sha256-cpEV0EWW9vd2ZE+RaqN9fhyy7axgPlx4PmlOeX3TSfY=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index a07dca699d79..4c62e6a8b6ad 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
- version = "3.2.5";
+ version = "3.2.6";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
- sha256 = "14kia9wjs0nqfx4psnr3vf4x6hihkf80gb0mjzmdnnnk4cnrdydm";
+ sha256 = "sha256-hTapy/wXt1rRZVdkx2RDW8LS/DcY30p+WaAWgemGqVo=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index d142551a1141..c94ee471c28a 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
- version = "1.159.2";
+ version = "1.160.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
- sha256 = "sha256-dSZd+Dsln7xUfN/cqTZSdnpnINHsDCBrbNGcDLwqzzU=";
+ sha256 = "sha256-42V6RFa+mAXyaUuKeDQa9Voi1MjnzcVl+cOA65VabxM=";
};
postPatch = ''
diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json
index 430061e0eb72..efb179333bf2 100644
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@@ -16,8 +16,8 @@
},
"ATSynEdit": {
"owner": "Alexey-T",
- "rev": "2022.03.23",
- "sha256": "sha256-D/pQ4TSWUaL97Nau3bGi7rc8MxnvuoDcD7HDNEDwmsk="
+ "rev": "2022.04.06",
+ "sha256": "sha256-EnPOAl1qsdcYzmUgT5rSYqY/xOLSfDcMNCXIG8LC4H0="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
diff --git a/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix
new file mode 100644
index 000000000000..82ea42aa2b83
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "control-lock";
+
+ src = fetchurl {
+ url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el";
+ sha256 = "1b5xcgq2r565pr1c14dwrmn1fl05p56infapa5pqvajv2kpfla7h";
+ };
+
+ dontUnpack = true;
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install $src $out/share/emacs/site-lisp/control-lock.el
+ '';
+
+ meta = {
+ description = "Like caps-lock, but for your control key. Give your pinky a rest!";
+ homepage = "https://www.emacswiki.org/emacs/control-lock.el";
+ platforms = lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 676b9bfca9a6..a27135032e18 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -190,6 +190,8 @@
perl-completion = callPackage ./perl-completion { };
+ control-lock = callPackage ./control-lock { };
+
plz = callPackage ./plz { };
pod-mode = callPackage ./pod-mode { };
diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix
new file mode 100644
index 000000000000..330235b80d73
--- /dev/null
+++ b/pkgs/applications/misc/bikeshed/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+# build inputs
+, aiofiles
+, aiohttp
+, attrs
+, certifi
+, cssselect
+, html5lib
+, isodate
+, json-home-client
+, lxml
+, pillow
+, pygments
+, requests
+, result
+, setuptools
+, tenacity
+, widlparser
+}:
+
+buildPythonApplication rec {
+ pname = "bikeshed";
+ version = "3.4.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-vJW4yNbKCZraJ5vx8FheNsBl+zObGoLFgAVqoU0p9QQ=";
+ };
+
+ # Relax requirements from "==" to ">="
+ # https://github.com/tabatkins/bikeshed/issues/2178
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "==" ">="
+ '';
+
+ propagatedBuildInputs = [
+ aiofiles
+ aiohttp
+ attrs
+ certifi
+ cssselect
+ html5lib
+ isodate
+ json-home-client
+ lxml
+ pillow
+ pygments
+ requests
+ result
+ setuptools
+ tenacity
+ widlparser
+ ];
+
+ checkPhase = ''
+ $out/bin/bikeshed test
+ '';
+
+ pythonImportsCheck = [ "bikeshed" ];
+
+ meta = with lib; {
+ description = "Preprocessor for anyone writing specifications that converts source files into actual specs";
+ longDescription = ''
+ Bikeshed is a pre-processor for spec documents, turning a source document
+ (containing only the actual spec content, plus several shorthands for linking
+ to terms and other things) into a final spec document, with appropriate boilerplate,
+ bibliography, indexes, etc all filled in. It's used on specs for CSS
+ and many other W3C working groups, WHATWG, the C++ standards committee, and elsewhere!
+ '';
+ homepage = "https://tabatkins.github.io/bikeshed/";
+ license = licenses.cc0;
+ maintainers = [ maintainers.kvark ];
+ };
+}
diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix
index 95a909c29a97..de6071ef0600 100644
--- a/pkgs/applications/misc/gsctl/default.nix
+++ b/pkgs/applications/misc/gsctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gsctl";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "giantswarm";
repo = pname;
rev = version;
- sha256 = "sha256-uCNWgaLZMm1vPxFduj8mpjKYuYlp1ChF6bK+bmAWy50=";
+ sha256 = "sha256-P1hJoZ1YSZTCo5ha/Um/nYVVhbYC3dcrQGJYTSnqNu4=";
};
- vendorSha256 = "sha256-lZgHrQYqoyoM1Iv6vCqTMcv62zSKyxaAsq56kUXHrIA=";
+ vendorSha256 = "sha256-NeRABlKUpD2ZHRid/vu34Dh9uHZ+7IXWFPX8jkexUog=";
ldflags =
[ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ];
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 000fc06bbf1b..6398b88ffccd 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "zathura";
- version = "0.4.8";
+ version = "0.4.9";
src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
- sha256 = "1nr0ym1mi2afk4ycdf1ppmkcv7i7hyzwn4p3r4m0j2qm3nvaiami";
+ sha256 = "0msy7s57mlx0wya99qpia4fpcy40pbj253kmx2y97nb0sqnc8c7w";
};
outputs = [ "bin" "man" "dev" "out" ];
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index c19bb1dfe8a5..b83aae6c34be 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
- "version": "100.0.4896.60",
- "sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf",
- "sha256bin64": "07wavs9r6ilwx5rzyqvydcjskg6sml5b8m6mw7qzykvhs8bnvfh5",
+ "version": "100.0.4896.75",
+ "sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4",
+ "sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5",
"deps": {
"gn": {
"version": "2022-01-21",
@@ -56,8 +56,8 @@
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
},
"ungoogled-patches": {
- "rev": "100.0.4896.60-1",
- "sha256": "02q7ghxynkgkbilcb8bx8q26s80fvd4hbc58zq74pnzpmn7qi342"
+ "rev": "100.0.4896.75-1",
+ "sha256": "0s31dclgk3x9302wr5yij77361bqam2sfki39p651gwysfizb73n"
}
}
}
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 53d5733bb584..e744f2a31c65 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.12.0";
+ version = "1.12.1";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-1eWd4En14p8E04kLWbsbJSEdjManQ87N/P3klFbUQx4=";
+ sha256 = "sha256-CpvoovTn++RTQjyeOlHTG+cjn32F+9qP32+YHpoLB8M=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index 84ba5330da10..6c88926ca242 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh";
homepage = "https://istio.io/latest/docs/reference/commands/istioctl";
license = licenses.asl20;
- maintainers = with maintainers; [ veehaitch ];
+ maintainers = with maintainers; [ superherointj bryanasdev000 veehaitch ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index f08f403de282..4b935027d2e2 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -1,11 +1,11 @@
{ lib, buildGoModule, fetchFromGitHub }:
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
-let rev = "1005bee8fff1b8daa30ddbcca717d03384630a71";
+let rev = "51c79060fc1433233eb43842de564f0f2e47be86";
in
buildGoModule rec {
pname = "sonobuoy";
- version = "0.56.3"; # Do not forget to update `rev` above
+ version = "0.56.4"; # Do not forget to update `rev` above
ldflags =
let t = "github.com/vmware-tanzu/sonobuoy";
@@ -20,10 +20,10 @@ buildGoModule rec {
owner = "vmware-tanzu";
repo = "sonobuoy";
rev = "v${version}";
- sha256 = "sha256-7yN3/bGjcntzMQRbB//fmqvD7me/xKLytfF+mQ1fcfc=";
+ sha256 = "sha256-6kHqfWDrZL3J5SrZ3JK50Z2Sw8mwM0zrfaKWo22g27A=";
};
- vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc=";
+ vendorSha256 = "sha256-8n4a1PLUYDU46lVegQoOCmmRSR1XfnjgEGZ+R5f36Ic=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 897acd76237a..e6fa464df6b6 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -66,6 +66,7 @@ let
timstott
zimbatm
zowoq
+ techknowlogick
];
};
} // attrs');
@@ -191,9 +192,9 @@ rec {
};
terraform_1 = mkTerraform {
- version = "1.1.7";
- sha256 = "sha256-E8qY17MSdA7fQW4wGSDiPzbndBP5SZwelAJAWzka/io=";
- vendorSha256 = "sha256-lyy/hcr00ix6qZoxzSfCbXvDC8dRB2ZjrONywpqbVZ8=";
+ version = "1.1.8";
+ sha256 = "sha256-U3RuLnDQD1EbPZG/wPuVMbSKmR3EqspkoK0Ky8aZb7k=";
+ vendorSha256 = "sha256-Jy9o0O80OjagrHG25CSPblI49zKx0N8pwvEotk9qm3s=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index b23f4f107aed..024ac9a14318 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.81.0.268";
+ version = "8.82.0.403";
rpath = lib.makeLibraryPath [
alsa-lib
@@ -68,7 +68,7 @@ let
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
- sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU=";
+ sha256 = "sha256-45aHb6BI0kUnJOlRsglyGdZ6+8sLmHZK3FN8nYpuHXM=";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 5eb7518ea378..5b542efff230 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -44,14 +44,14 @@ let
pname = "slack";
- x86_64-darwin-version = "4.23.0";
- x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd";
+ x86_64-darwin-version = "4.25.0";
+ x86_64-darwin-sha256 = "1ffg003ic0jhkis9ai2873axwzqj9yvjab8212zwhvr3a23zzr5c";
- x86_64-linux-version = "4.23.0";
- x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is";
+ x86_64-linux-version = "4.25.0";
+ x86_64-linux-sha256 = "0b22hnf9bzdzffnxrsjqcimqhz5imshvp9gw9baz12d45jh610g8";
- aarch64-darwin-version = "4.23.0";
- aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3";
+ aarch64-darwin-version = "4.25.0";
+ aarch64-darwin-sha256 = "0s4c66bzi42y2r1c94r4ds5fyzzgvzkvrria0z45ysa47lnldp0f";
version = {
x86_64-darwin = x86_64-darwin-version;
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index ab66b28fe17a..1793956b1d3a 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -445,13 +445,13 @@ let
sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==";
};
};
- "@types/lodash-4.14.180" = {
+ "@types/lodash-4.14.181" = {
name = "_at_types_slash_lodash";
packageName = "@types/lodash";
- version = "4.14.180";
+ version = "4.14.181";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz";
- sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==";
+ url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz";
+ sha512 = "n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==";
};
};
"@types/lossless-json-1.0.1" = {
@@ -661,13 +661,13 @@ let
sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
};
};
- "adler-32-1.3.0" = {
+ "adler-32-1.3.1" = {
name = "adler-32";
packageName = "adler-32";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz";
- sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==";
+ url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz";
+ sha512 = "ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==";
};
};
"agent-base-6.0.2" = {
@@ -958,22 +958,22 @@ let
sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA==";
};
};
- "avsc-5.7.3" = {
+ "avsc-5.7.4" = {
name = "avsc";
packageName = "avsc";
- version = "5.7.3";
+ version = "5.7.4";
src = fetchurl {
- url = "https://registry.npmjs.org/avsc/-/avsc-5.7.3.tgz";
- sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
+ url = "https://registry.npmjs.org/avsc/-/avsc-5.7.4.tgz";
+ sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
- "aws-sdk-2.1101.0" = {
+ "aws-sdk-2.1106.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1101.0";
+ version = "2.1106.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz";
- sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1106.0.tgz";
+ sha512 = "3dr0TTR2LI70ST8fa4IgXHpWdH4yv7FLnt9YEndwFQ8ar2EMCMpMU67wwCGBA72GUi0aOg4+lsLjGmCvIq3jug==";
};
};
"aws-sign2-0.7.0" = {
@@ -1174,6 +1174,15 @@ let
sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
};
};
+ "body-parser-1.20.0" = {
+ name = "body-parser";
+ packageName = "body-parser";
+ version = "1.20.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz";
+ sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==";
+ };
+ };
"body-parser-xml-2.0.3" = {
name = "body-parser-xml";
packageName = "body-parser-xml";
@@ -1435,13 +1444,13 @@ let
sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw==";
};
};
- "cheerio-select-1.5.0" = {
+ "cheerio-select-1.6.0" = {
name = "cheerio-select";
packageName = "cheerio-select";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz";
- sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==";
+ url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz";
+ sha512 = "eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==";
};
};
"chokidar-3.5.2" = {
@@ -1894,22 +1903,22 @@ let
sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==";
};
};
- "css-select-4.2.1" = {
+ "css-select-4.3.0" = {
name = "css-select";
packageName = "css-select";
- version = "4.2.1";
+ version = "4.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz";
- sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==";
+ url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz";
+ sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==";
};
};
- "css-what-5.1.0" = {
+ "css-what-6.1.0" = {
name = "css-what";
packageName = "css-what";
- version = "5.1.0";
+ version = "6.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz";
- sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==";
+ url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz";
+ sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
};
};
"cssfilter-0.0.10" = {
@@ -2074,6 +2083,15 @@ let
sha1 = "978857442c44749e4206613e37946205826abd80";
};
};
+ "destroy-1.2.0" = {
+ name = "destroy";
+ packageName = "destroy";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz";
+ sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==";
+ };
+ };
"detect-libc-1.0.3" = {
name = "detect-libc";
packageName = "detect-libc";
@@ -2299,13 +2317,13 @@ let
sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
};
};
- "es-abstract-1.19.1" = {
+ "es-abstract-1.19.2" = {
name = "es-abstract";
packageName = "es-abstract";
- version = "1.19.1";
+ version = "1.19.2";
src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz";
- sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==";
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz";
+ sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==";
};
};
"es-to-primitive-1.2.1" = {
@@ -3064,6 +3082,15 @@ let
sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==";
};
};
+ "http-errors-2.0.0" = {
+ name = "http-errors";
+ packageName = "http-errors";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz";
+ sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==";
+ };
+ };
"http-proxy-agent-4.0.1" = {
name = "http-proxy-agent";
packageName = "http-proxy-agent";
@@ -3442,13 +3469,13 @@ let
sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
};
};
- "is-number-object-1.0.6" = {
+ "is-number-object-1.0.7" = {
name = "is-number-object";
packageName = "is-number-object";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz";
- sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==";
+ url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz";
+ sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==";
};
};
"is-promise-1.0.1" = {
@@ -3496,13 +3523,13 @@ let
sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==";
};
};
- "is-shared-array-buffer-1.0.1" = {
+ "is-shared-array-buffer-1.0.2" = {
name = "is-shared-array-buffer";
packageName = "is-shared-array-buffer";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz";
- sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==";
+ url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz";
+ sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==";
};
};
"is-stream-2.0.1" = {
@@ -4504,13 +4531,13 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
- "n8n-core-0.111.0" = {
+ "n8n-core-0.112.0" = {
name = "n8n-core";
packageName = "n8n-core";
- version = "0.111.0";
+ version = "0.112.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.111.0.tgz";
- sha512 = "fZLLJ60yIuuX+geKGQrO6jk+kxn1UaCJMoWEi2FVE+InTmi+/r51Bv6LGoapoW0Oz+Em+CDq0wE7Yzg3xNx7fw==";
+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.112.0.tgz";
+ sha512 = "1b/J9XWBrjqMCcDAM1vZlsEpeBXI7gZ9Jpxgpgu4eHh3l/BJfyeqq5KXgULfyDtolDn/bil0s7qXA2njmZLerw==";
};
};
"n8n-design-system-0.16.0" = {
@@ -4522,31 +4549,31 @@ let
sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA==";
};
};
- "n8n-editor-ui-0.137.0" = {
+ "n8n-editor-ui-0.138.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.137.0";
+ version = "0.138.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.137.0.tgz";
- sha512 = "/wYAIh/3RtVaFxY+vtVEACfo6xsVOi3cEPWd+GSFCK/AMxXs517CNGbwNz54geqaGNUH+rhhUz87C0pG+TgiUg==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.138.0.tgz";
+ sha512 = "1/mUJYSWG4vmUfMlT65lvtQzfDBMCHxhdIU3TUG2umvdIEsSHJM1gZwAPfoJZppoZ6DX/ApuxXY/67OXfgatQw==";
};
};
- "n8n-nodes-base-0.168.0" = {
+ "n8n-nodes-base-0.169.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.168.0";
+ version = "0.169.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.168.0.tgz";
- sha512 = "TyIL5Gwn+qvfi+1nNkQTPfrJYMqjx2P2OCiDWAMfzahauJyJpfJMYpIEKF3UxoKXCfWpBYPmHVoov6GadEOR1w==";
+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.169.0.tgz";
+ sha512 = "O8vwS7ROybSRLqXwG58xdLNrbA8hAvX4jSodXsztpGChbDWcrYJUXBewN9+Lfh1UAegz12G1devygc1W92qveQ==";
};
};
- "n8n-workflow-0.93.0" = {
+ "n8n-workflow-0.94.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
- version = "0.93.0";
+ version = "0.94.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.93.0.tgz";
- sha512 = "IqZrnTKdIZD7aeL9/FiwoI7w1WBgeBmqZVXRF+OGtIHooK/lDkHpy17hoXXqAyeATiVf2licgl8F/zMvSsnuJA==";
+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.94.0.tgz";
+ sha512 = "cVs5XPlbNDcCrGU5IoYzjO7IOsYNsNtEt5vVxkL9q5EgEmHhPYakValJN4GyLQ7Otdpsf47lJg/0EG3TvOssGQ==";
};
};
"named-placeholders-1.1.2" = {
@@ -4567,13 +4594,13 @@ let
sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==";
};
};
- "nanoid-3.3.1" = {
+ "nanoid-3.3.2" = {
name = "nanoid";
packageName = "nanoid";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz";
- sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==";
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz";
+ sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==";
};
};
"native-duplexpair-1.0.0" = {
@@ -4864,6 +4891,15 @@ let
sha1 = "20f1336481b083cd75337992a16971aa2d906947";
};
};
+ "on-finished-2.4.1" = {
+ name = "on-finished";
+ packageName = "on-finished";
+ version = "2.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz";
+ sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==";
+ };
+ };
"on-headers-1.0.2" = {
name = "on-headers";
packageName = "on-headers";
@@ -5431,15 +5467,6 @@ let
sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
};
};
- "printj-1.2.3" = {
- name = "printj";
- packageName = "printj";
- version = "1.2.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz";
- sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==";
- };
- };
"printj-1.3.1" = {
name = "printj";
packageName = "printj";
@@ -5737,6 +5764,15 @@ let
sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";
};
};
+ "raw-body-2.5.1" = {
+ name = "raw-body";
+ packageName = "raw-body";
+ version = "2.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz";
+ sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==";
+ };
+ };
"rc-1.2.8" = {
name = "rc";
packageName = "rc";
@@ -6286,13 +6322,13 @@ let
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
};
};
- "simple-git-2.48.0" = {
+ "simple-git-3.5.0" = {
name = "simple-git";
packageName = "simple-git";
- version = "2.48.0";
+ version = "3.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz";
- sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A==";
+ url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz";
+ sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==";
};
};
"simple-lru-cache-0.0.2" = {
@@ -6430,13 +6466,13 @@ let
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
};
};
- "ssh2-1.8.0" = {
+ "ssh2-1.9.0" = {
name = "ssh2";
packageName = "ssh2";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ssh2/-/ssh2-1.8.0.tgz";
- sha512 = "NVIRkIwJvWl+mcRozp+EBzHMVCcbDKBea64ToPdZEk43yAVGwmfqYZRPFRnnvGjsKC34wYCmiupTcKgCVNVNNg==";
+ url = "https://registry.npmjs.org/ssh2/-/ssh2-1.9.0.tgz";
+ sha512 = "rhhIZT0eMPvCBSOG8CpqZZ7gre2vgXaIqmb3Jb83t88rjsxIsFzDanqBJM9Ns8BmP1835A5IbQ199io4EUZwOA==";
};
};
"ssh2-sftp-client-7.2.3" = {
@@ -6484,6 +6520,15 @@ let
sha1 = "161c7dac177659fd9811f43771fa99381478628c";
};
};
+ "statuses-2.0.1" = {
+ name = "statuses";
+ packageName = "statuses";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz";
+ sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==";
+ };
+ };
"stealthy-require-1.1.1" = {
name = "stealthy-require";
packageName = "stealthy-require";
@@ -7258,13 +7303,13 @@ let
sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA==";
};
};
- "vue-i18n-8.27.0" = {
+ "vue-i18n-8.27.1" = {
name = "vue-i18n";
packageName = "vue-i18n";
- version = "8.27.0";
+ version = "8.27.1";
src = fetchurl {
- url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.0.tgz";
- sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw==";
+ url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.1.tgz";
+ sha512 = "lWrGm4F25qReJ7XxSnFVb2h3PfW54ldnM4C+YLBGGJ75+Myt/kj4hHSTKqsyDLamvNYpvINMicSOdW+7yuqgIQ==";
};
};
"vue2-boring-avatars-0.3.4" = {
@@ -7579,10 +7624,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.170.0";
+ version = "0.171.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.170.0.tgz";
- sha512 = "aY4A9+P7K6iinxFyDZl9Jdin283csAbiMStjfxLX5IfO75/aNbjXhSmpjclV9PCUuuTonvoMiVMTvpbCaeImqg==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.171.0.tgz";
+ sha512 = "GenMxluqj0PfttyWndoMUsmyJ8r5pilWoY7xT+TVjCl5znhtIUT+3GTeDZ8K3vYqJILHXVxspyF5yLz2Ytnjow==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@@ -7691,7 +7736,7 @@ in
sources."@types/ftp-0.3.33"
sources."@types/json-diff-0.5.2"
sources."@types/jsonwebtoken-8.5.8"
- sources."@types/lodash-4.14.180"
+ sources."@types/lodash-4.14.181"
sources."@types/lossless-json-1.0.1"
sources."@types/mime-1.3.2"
sources."@types/node-17.0.23"
@@ -7762,8 +7807,8 @@ in
sources."semver-6.3.0"
];
})
- sources."avsc-5.7.3"
- (sources."aws-sdk-2.1101.0" // {
+ sources."avsc-5.7.4"
+ (sources."aws-sdk-2.1106.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -7817,7 +7862,7 @@ in
})
sources."bluebird-3.7.2"
sources."bn.js-4.12.0"
- (sources."body-parser-1.19.2" // {
+ (sources."body-parser-1.20.0" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
@@ -7853,11 +7898,7 @@ in
sources."caseless-0.12.0"
(sources."cfb-1.2.1" // {
dependencies = [
- (sources."adler-32-1.3.0" // {
- dependencies = [
- sources."printj-1.2.3"
- ];
- })
+ sources."adler-32-1.3.1"
sources."printj-1.3.1"
];
})
@@ -7870,7 +7911,7 @@ in
sources."chardet-0.7.0"
sources."charenc-0.0.2"
sources."cheerio-1.0.0-rc.6"
- sources."cheerio-select-1.5.0"
+ sources."cheerio-select-1.6.0"
sources."chokidar-3.5.2"
sources."chownr-1.1.4"
sources."clamp-1.0.1"
@@ -7956,8 +7997,8 @@ in
sources."crypt-0.0.2"
sources."crypto-js-4.1.1"
sources."csrf-3.1.0"
- sources."css-select-4.2.1"
- sources."css-what-5.1.0"
+ sources."css-select-4.3.0"
+ sources."css-what-6.1.0"
sources."cssfilter-0.0.10"
sources."dashdash-1.14.1"
sources."date-utils-1.2.21"
@@ -7969,8 +8010,8 @@ in
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."denque-1.5.1"
- sources."depd-1.1.2"
- sources."destroy-1.0.4"
+ sources."depd-2.0.0"
+ sources."destroy-1.2.0"
sources."detect-libc-1.0.3"
sources."diagnostics-1.1.1"
sources."difflib-0.2.4"
@@ -8006,7 +8047,7 @@ in
sources."entities-2.2.0"
sources."env-variable-0.0.6"
sources."err-code-2.0.3"
- sources."es-abstract-1.19.1"
+ sources."es-abstract-1.19.2"
sources."es-to-primitive-1.2.1"
sources."es5-ext-0.8.2"
sources."escalade-3.1.1"
@@ -8022,9 +8063,16 @@ in
sources."expand-tilde-2.0.2"
(sources."express-4.17.3" // {
dependencies = [
+ sources."body-parser-1.19.2"
sources."cookie-0.4.2"
sources."debug-2.6.9"
+ sources."depd-1.1.2"
+ sources."http-errors-1.8.1"
sources."ms-2.0.0"
+ sources."on-finished-2.3.0"
+ sources."qs-6.9.7"
+ sources."raw-body-2.4.3"
+ sources."statuses-1.5.0"
];
})
sources."extend-3.0.2"
@@ -8048,6 +8096,8 @@ in
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
+ sources."on-finished-2.3.0"
+ sources."statuses-1.5.0"
];
})
sources."flatted-3.2.5"
@@ -8126,7 +8176,7 @@ in
sources."homedir-polyfill-1.0.3"
sources."html-to-text-8.0.0"
sources."htmlparser2-6.1.0"
- sources."http-errors-1.8.1"
+ sources."http-errors-2.0.0"
sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
sources."https-proxy-agent-5.0.0"
@@ -8162,13 +8212,13 @@ in
sources."is-negated-glob-1.0.0"
sources."is-negative-zero-2.0.2"
sources."is-number-7.0.0"
- sources."is-number-object-1.0.6"
+ sources."is-number-object-1.0.7"
sources."is-promise-1.0.1"
sources."is-property-1.0.2"
sources."is-regex-1.1.4"
sources."is-relative-1.0.0"
sources."is-retry-allowed-2.2.0"
- sources."is-shared-array-buffer-1.0.1"
+ sources."is-shared-array-buffer-1.0.2"
sources."is-stream-2.0.1"
sources."is-string-1.0.7"
sources."is-symbol-1.0.4"
@@ -8327,19 +8377,15 @@ in
];
})
sources."mz-2.7.0"
- (sources."n8n-core-0.111.0" // {
- dependencies = [
- sources."qs-6.10.3"
- ];
- })
+ sources."n8n-core-0.112.0"
sources."n8n-design-system-0.16.0"
- sources."n8n-editor-ui-0.137.0"
- (sources."n8n-nodes-base-0.168.0" // {
+ sources."n8n-editor-ui-0.138.0"
+ (sources."n8n-nodes-base-0.169.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
- sources."n8n-workflow-0.93.0"
+ sources."n8n-workflow-0.94.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@@ -8347,7 +8393,7 @@ in
];
})
sources."nanoclone-0.2.1"
- sources."nanoid-3.3.1"
+ sources."nanoid-3.3.2"
sources."native-duplexpair-1.0.0"
(sources."nearley-2.20.1" // {
dependencies = [
@@ -8402,7 +8448,7 @@ in
sources."async-1.5.2"
];
})
- sources."on-finished-2.3.0"
+ sources."on-finished-2.4.1"
sources."on-headers-1.0.2"
sources."once-1.4.0"
sources."one-time-1.0.0"
@@ -8520,7 +8566,7 @@ in
})
sources."punycode-2.1.1"
sources."python-struct-1.1.3"
- sources."qs-6.9.7"
+ sources."qs-6.10.3"
sources."querystring-0.2.0"
sources."querystringify-2.2.0"
sources."queue-microtask-1.2.3"
@@ -8530,7 +8576,7 @@ in
sources."random-bytes-1.0.0"
sources."randombytes-2.1.0"
sources."range-parser-1.2.1"
- sources."raw-body-2.4.3"
+ sources."raw-body-2.5.1"
sources."rc-1.2.8"
sources."readable-stream-1.1.14"
sources."readable-web-to-node-stream-2.0.0"
@@ -8593,7 +8639,12 @@ in
sources."ms-2.0.0"
];
})
+ sources."depd-1.1.2"
+ sources."destroy-1.0.4"
+ sources."http-errors-1.8.1"
sources."ms-2.1.3"
+ sources."on-finished-2.3.0"
+ sources."statuses-1.5.0"
];
})
(sources."sentence-case-3.0.4" // {
@@ -8612,7 +8663,7 @@ in
sources."shell-escape-0.2.0"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
- sources."simple-git-2.48.0"
+ sources."simple-git-3.5.0"
sources."simple-lru-cache-0.0.2"
sources."simple-swizzle-0.2.2"
sources."slash-3.0.0"
@@ -8643,12 +8694,12 @@ in
sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
- sources."ssh2-1.8.0"
+ sources."ssh2-1.9.0"
sources."ssh2-sftp-client-7.2.3"
sources."sshpk-1.17.0"
sources."stack-trace-0.0.10"
sources."standard-as-callback-2.1.0"
- sources."statuses-1.5.0"
+ sources."statuses-2.0.1"
sources."stealthy-require-1.1.1"
sources."stream-shift-1.0.1"
sources."string-similarity-4.0.4"
@@ -8672,7 +8723,6 @@ in
dependencies = [
sources."@types/node-12.20.47"
sources."bl-3.0.1"
- sources."depd-2.0.0"
sources."iconv-lite-0.5.2"
sources."readable-stream-3.6.0"
sources."string_decoder-1.3.0"
@@ -8773,7 +8823,7 @@ in
sources."vue-2.6.14"
sources."vue-color-2.8.1"
sources."vue-fragment-1.5.2"
- sources."vue-i18n-8.27.0"
+ sources."vue-i18n-8.27.1"
sources."vue2-boring-avatars-0.3.4"
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"
diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix
index f548cf01fcd5..53fd1f07b6e6 100644
--- a/pkgs/applications/office/vnote/default.nix
+++ b/pkgs/applications/office/vnote/default.nix
@@ -8,14 +8,14 @@
mkDerivation rec {
pname = "vnote";
- version = "3.12.888";
+ version = "3.13.0";
src = fetchFromGitHub {
owner = "vnotex";
repo = pname;
fetchSubmodules = true;
rev = "v${version}";
- sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc=";
+ sha256 = "sha256-osJvoi7oyZupJ/bnqpm0TdZ5cMYEeOw9DHOIAzONKLg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 74b89ed98c55..db2e74f24523 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -138,6 +138,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://caffe.berkeleyvision.org/";
maintainers = with maintainers; [ ];
+ broken = pythonSupport && (python.isPy310);
license = licenses.bsd2;
platforms = platforms.linux ++ platforms.darwin;
};
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index c9ffb8ed5cb3..8e5e1ebd7e80 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -2,6 +2,7 @@
, opencv3, gtest, blas, gomp, llvmPackages, perl
, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
, cudnnSupport ? cudaSupport, cudnn
+, cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ]
}:
assert cudnnSupport -> cudaSupport;
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
"-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743
"-DCUDA_ARCH_NAME=All"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
+ "-DMXNET_CUDA_ARCH=${lib.concatStringsSep ";" cudaCapabilities}"
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
@@ -60,6 +62,12 @@ stdenv.mkDerivation rec {
rm "$out"/lib/*.a
'';
+ # used to mark cudaSupport in python310Packages.mxnet as broken;
+ # other attributes exposed for consistency
+ passthru = {
+ inherit cudaSupport cudnnSupport cudatoolkit cudnn;
+ };
+
meta = with lib; {
description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler";
homepage = "https://mxnet.incubator.apache.org/";
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index e680c0c3b22d..cdff1e8477ab 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -151,6 +151,7 @@ writeTextFile rec {
# needed for cython
export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
+ export CXX='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++'
# cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
export LDFLAGS='${
lib.concatStringsSep " " (map (pkg: "-L${pkg}/lib") [
@@ -178,6 +179,7 @@ writeTextFile rec {
mpfr.dev
])
}'
+ export CXXFLAGS=$CFLAGS
export SAGE_LIB='${sagelib}/${python3.sitePackages}'
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 22e3a288b7d7..04c2355d26aa 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -121,10 +121,10 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/33170
(fetchSageDiff {
- base = "9.5.rc1";
- name = "ipython-8-update.patch";
- rev = "a90a314616d86d6be9c0d5233f0d36c4bfe06231";
- sha256 = "sha256-pXdtokTo84xNCnV+HyAKEzG562z8FjzJ7hczOja0dRw=";
+ base = "9.6.beta5";
+ name = "ipython-8.1-update.patch";
+ rev = "4d2b53f1541375861310af3a7f7109c1c2ed475d";
+ sha256 = "sha256-ELda/VBzsQH7NdFas69fQ35QPUoJCeLx/gxT1j7qGR8=";
})
# https://trac.sagemath.org/ticket/32968
@@ -156,6 +156,22 @@ stdenv.mkDerivation rec {
# adapted from https://trac.sagemath.org/ticket/23712#comment:22
./patches/tachyon-renamed-focallength.patch
+
+ # https://trac.sagemath.org/ticket/33336
+ (fetchSageDiff {
+ base = "9.6.beta2";
+ name = "scipy-1.8-update.patch";
+ rev = "9c8235e44ffb509efa8a3ca6cdb55154e2b5066d";
+ sha256 = "sha256-bfc4ljNOxVnhlmxIuNbjbKl4vJXYq2tlF3Z8bbC8PWw=";
+ })
+
+ # https://trac.sagemath.org/ticket/33495
+ (fetchSageDiff {
+ base = "9.6.beta5";
+ name = "networkx-2.7-update.patch";
+ rev = "8452003846a7303100847d8d0ed642fc642c11d6";
+ sha256 = "sha256-A/XMouPlc2sjFp30L+56fBGJXydS2EtzfPOV98FCDqI=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 8d685c8da60f..92eae35688f7 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -181,11 +181,16 @@ buildPythonPackage rec {
# some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg
# are generated by the bootstrap script using m4. these can fetch data from
# build/pkgs, either directly or via sage-get-system-packages.
- sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
- sed -i 's/, <3.4//' ../rpy2/install-requires.txt
- sed -i 's/, <4.3//' ../sphinx/install-requires.txt
sed -i '/sage_conf/d' src/setup.cfg.m4
sed -i '/sage_conf/d' src/requirements.txt.m4
+
+ # version lower bounds are useful, but upper bounds are a hassle because
+ # Sage tests already catch any relevant API breakage.
+ # according to the discussion at https://trac.sagemath.org/ticket/33520,
+ # upper bounds will be less noisy starting from Sage 9.6.
+ sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
+ sed -i 's/, <[^, ]*//' ../*/install-requires.txt
+
for infile in src/*.m4; do
if [ -f "$infile" ]; then
outfile="src/$(basename $infile .m4)"
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 76d2c782b4d4..f14fb489a996 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "wxmaxima";
- version = "21.11.0";
+ version = "22.03.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${version}";
- sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk=";
+ sha256 = "sha256-ynLx1HPfDjLbyFziWFbjpCeUBaA3hAFRFm5/1GeFKRE=";
};
buildInputs = [
diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 9b440963f4ae..e98eb404b9c7 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
- sha256 = "sha256-NJNFjzbiBcmXcBF1k0qybv5LnkaQ+1ehSfF18CC85JY=";
+ sha256 = "sha256-AGRdmYKd76k5tmBTTqsSHj3yOU8QSd11G5ito0O/dWY=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 16c25aea9ae4..fc264cdc5908 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
- sha256 = "sha256-dHq1t1ebPSAS5H14Kd03xCiHV9UhAH0dIxikQK0rHQk=";
+ sha256 = "sha256-6yc+7Fc22b8xN8thRrxxpjdEz19aBYCWxgkh/nra784=";
};
vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ=";
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix
index 0928fbcfb4ef..da23386d41ce 100644
--- a/pkgs/applications/window-managers/sway/idle.nix
+++ b/pkgs/applications/window-managers/sway/idle.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ];
+ postPatch = "substituteInPlace main.c --replace '%lu' '%zu'";
+
meta = with lib; {
description = "Idle management daemon for Wayland";
longDescription = ''
diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh
index b5c5ed81eb97..313ebc980344 100644
--- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh
+++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh
@@ -28,14 +28,15 @@ copyDesktopItems() {
return
fi
+ applications="${!outputBin}/share/applications"
for desktopItem in $desktopItems; do
if [[ -f "$desktopItem" ]]; then
- echo "Copying '$desktopItem' into '$out/share/applications'"
- install -D -m 444 -t "$out"/share/applications "$desktopItem"
+ echo "Copying '$desktopItem' into '${applications}'"
+ install -D -m 444 -t "${applications}" "$desktopItem"
else
for f in "$desktopItem"/share/applications/*.desktop; do
- echo "Copying '$f' into '$out/share/applications'"
- install -D -m 444 -t "$out"/share/applications "$f"
+ echo "Copying '$f' into '${applications}'"
+ install -D -m 444 -t "${applications}" "$f"
done
fi
done
diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix
index b8783e4db462..3269739df9af 100644
--- a/pkgs/desktops/gnome/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome/apps/gedit/default.nix
@@ -5,6 +5,7 @@
, python3
, pkg-config
, gtk3
+, gtk-mac-integration
, glib
, adwaita-icon-theme
, libpeas
@@ -24,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "gedit";
- version = "41.0";
+ version = "42.0";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "epsYsViAjRiSmJFl83BsTxooKXkHmrdFinnTwkrU3rU=";
+ sha256 = "qHmR9Clh609qvNuqu3hHYMI66u765jY9PiGmHpxFhDc=";
};
patches = [
@@ -59,6 +60,8 @@ stdenv.mkDerivation rec {
gtksourceview4
libpeas
libsoup
+ ] ++ lib.optionals stdenv.isDarwin [
+ gtk-mac-integration
];
postPatch = ''
diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix
index 4c6f960d8c84..af6a81b34787 100644
--- a/pkgs/desktops/gnome/core/sushi/default.nix
+++ b/pkgs/desktops/gnome/core/sushi/default.nix
@@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "sushi";
- version = "41.1";
+ version = "41.2";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "JifbYWLnV3hZDAfhZbLzbqJNEjGlE7FkAj/G3fx1xKM=";
+ sha256 = "tZ+0LJllxzYfdilt0qNARatlUGXqQUPeWsiyygyq6l4=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 82eece370dd8..977d1a0b9fcc 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
- version = "6.0.1";
+ version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268";
+ sha256 = "sha256-/8K3xSbzlagOT0zHdXNwEERJP88C+H2I6qJHXwdlTS4=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 46703b349e67..70ab050c7ec1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-aRh2zbKqcGOH4Qw5gdJw07hod8a/QGWUcJo/2R9erQs=";
+ sha256 = "sha256-Fppl/IvdlW8lZ6YKEHaHNticv3FFFKEKTPPVnz4u9b4=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 8a23f09838eb..ed258623ab24 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I=";
+ sha256 = "sha256-hyBmo9P68XSXRUuLw+baEAetba2QdqOwUti64geH6xc=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 4fa99f80c8e3..d7fa6ee59f0a 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -90,5 +90,5 @@ rec {
# latest cudnn, nccl, cutensor, etc! It sometimes happens that CUDA versions
# are released prior to compatibility with the rest of the ecosystem. And
# don't forget to request a review from @NixOS/cuda-maintainers!
- cudatoolkit_11 = cudatoolkit_11_5;
+ cudatoolkit_11 = cudatoolkit_11_5; # update me to 11_6 when cudnn>=8.3.3
}
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 1edf6e5ce7f1..be194039e928 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -80,11 +80,23 @@ let
# We need attoparsec < 0.14 to build elm for now
attoparsec = self.attoparsec_0_13_2_5;
+ # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5
+ aeson = self.aeson_1_5_6_0;
+
# Needed for elm-format
indents = self.callPackage ./packages/indents.nix {};
bimap = self.callPackage ./packages/bimap.nix {};
avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {});
elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {});
+ # We need tasty-hspec < 1.1.7 and hspec-golden < 0.2 to build elm-format-lib
+ tasty-hspec = self.tasty-hspec_1_1_6;
+ hspec-golden = self.hspec-golden_0_1_0_3;
+
+ # We need hspec hspec_core, hspec_discover < 2.8 for tasty-hspec == 1.1.6
+ hspec = self.hspec_2_7_10;
+ hspec-core = self.hspec-core_2_7_10;
+ hspec-discover = self.hspec-discover_2_7_10;
+
elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {};
elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
};
diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix
deleted file mode 100644
index c70133c98b35..000000000000
--- a/pkgs/development/compilers/go/2-dev.nix
+++ /dev/null
@@ -1,276 +0,0 @@
-{ lib
-, stdenv
-, fetchgit
-, tzdata
-, iana-etc
-, runCommand
-, perl
-, which
-, pkg-config
-, patch
-, procps
-, pcre
-, cacert
-, Security
-, Foundation
-, mailcap
-, runtimeShell
-, buildPackages
-, pkgsBuildTarget
-, callPackage
-}:
-
-let
- go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
-
- goBootstrap = runCommand "go-bootstrap" { } ''
- mkdir $out
- cp -rf ${go_bootstrap}/* $out/
- chmod -R u+w $out
- find $out -name "*.c" -delete
- cp -rf $out/bin/* $out/share/go/bin/
- '';
-
- goarch = platform: {
- "i686" = "386";
- "x86_64" = "amd64";
- "aarch64" = "arm64";
- "arm" = "arm";
- "armv5tel" = "arm";
- "armv6l" = "arm";
- "armv7l" = "arm";
- "powerpc64le" = "ppc64le";
- }.${platform.parsed.cpu.name} or (throw "Unsupported system");
-
- # We need a target compiler which is still runnable at build time,
- # to handle the cross-building case where build != host == target
- targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
-in
-
-stdenv.mkDerivation rec {
- pname = "go2-unstable";
- version = "2021-04-13";
-
- src = fetchgit {
- url = "https://go.googlesource.com/go";
- rev = "9cd52cf2a93a958e8e001aea36886e7846c91f2f";
- sha256 = "sha256:0hybm93y4i4j7bs86y7h73nc1wqnspkq75if7n1032zf9bs8sm96";
- };
-
- # perl is used for testing go vet
- nativeBuildInputs = [ perl which pkg-config patch procps ];
- buildInputs = [ cacert pcre ]
- ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
- ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
-
- depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
-
- hardeningDisable = [ "all" ];
-
- prePatch = ''
- echo '${version}' > VERSION
- patchShebangs ./ # replace /bin/bash
-
- # This source produces shell script at run time,
- # and thus it is not corrected by patchShebangs.
- substituteInPlace misc/cgo/testcarchive/carchive_test.go \
- --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
-
- # Patch the mimetype database location which is missing on NixOS.
- # but also allow static binaries built with NixOS to run outside nix
- sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
-
- # Disabling the 'os/http/net' tests (they want files not available in
- # chroot builds)
- rm src/net/{listen,parse}_test.go
- rm src/syscall/exec_linux_test.go
-
- # !!! substituteInPlace does not seems to be effective.
- # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
- sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
- sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
- # Fails on aarch64
- sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go
- # Skip this test since ssl patches mess it up.
- sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
- # Disable another PIE test which breaks.
- sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go
- # Disable the BuildModePie test
- sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go
- # Disable the unix socket test
- sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
- # Disable the hostname test
- sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
- # ParseInLocation fails the test
- sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
- # Remove the api check as it never worked
- sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
- # Remove the coverage test as we have removed this utility
- sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
- # Remove the timezone naming test
- sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
- # Remove disable setgid test
- sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
- # Remove cert tests that conflict with NixOS's cert resolution
- sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
- # TestWritevError hangs sometimes
- sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
- # TestVariousDeadlines fails sometimes
- sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
-
- sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-
- # Disable cgo lookup tests not works, they depend on resolver
- rm src/net/cgo_unix_test.go
-
- '' + lib.optionalString stdenv.isLinux ''
- # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
- # that run outside a nix server
- sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
-
- '' + lib.optionalString stdenv.isAarch32 ''
- echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
- '' + lib.optionalString stdenv.isDarwin ''
- substituteInPlace src/race.bash --replace \
- "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
- sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
- sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
- sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
-
- sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
- sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
- sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
- sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
-
- sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
- sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
-
- sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
-
- sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
-
- # TestCurrent fails because Current is not implemented on Darwin
- sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
- sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
-
- touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
- '';
-
- patches = [
- ./remove-tools-1.11.patch
- ./ssl-cert-file-2-dev.patch
- ./remove-test-pie-1.15.patch
- ./creds-test.patch
- ./go-1.9-skip-flaky-19608.patch
- ./go-1.9-skip-flaky-20072.patch
- ./skip-external-network-tests-1.16.patch
- ./skip-nohup-tests.patch
- ./skip-cgo-tests-1.15.patch
- ] ++ [
- # breaks under load: https://github.com/golang/go/issues/25628
- (if stdenv.isAarch32
- then ./skip-test-extra-files-on-aarch32-1.14.patch
- else ./skip-test-extra-files-on-386-1.14.patch)
- ];
-
- postPatch = ''
- find . -name '*.orig' -exec rm {} ';'
- '';
-
- GOOS = stdenv.targetPlatform.parsed.kernel.name;
- GOARCH = goarch stdenv.targetPlatform;
- # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
- # Go will nevertheless build a for host system that we will copy over in
- # the install phase.
- GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
- GOHOSTARCH = goarch stdenv.buildPlatform;
-
- # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
- # to be different from CC/CXX
- CC_FOR_TARGET =
- if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${targetCC}/bin/${targetCC.targetPrefix}cc"
- else
- null;
- CXX_FOR_TARGET =
- if (stdenv.buildPlatform != stdenv.targetPlatform) then
- "${targetCC}/bin/${targetCC.targetPrefix}c++"
- else
- null;
-
- GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
- GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
- CGO_ENABLED = 1;
- # Hopefully avoids test timeouts on Hydra
- GO_TEST_TIMEOUT_SCALE = 3;
-
- # Indicate that we are running on build infrastructure
- # Some tests assume things like home directories and users exists
- GO_BUILDER_NAME = "nix";
-
- GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
-
- postConfigure = ''
- export GOCACHE=$TMPDIR/go-cache
- # this is compiled into the binary
- export GOROOT_FINAL=$out/share/go
-
- export PATH=$(pwd)/bin:$PATH
-
- ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
- # Independent from host/target, CC should produce code for the building system.
- # We only set it when cross-compiling.
- export CC=${buildPackages.stdenv.cc}/bin/cc
- ''}
- ulimit -a
- '';
-
- postBuild = ''
- (cd src && ./make.bash)
- '';
-
- doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
-
- checkPhase = ''
- runHook preCheck
- (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
- runHook postCheck
- '';
-
- preInstall = ''
- rm -r pkg/obj
- # Contains the wrong perl shebang when cross compiling,
- # since it is not used for anything we can deleted as well.
- rm src/regexp/syntax/make_perl_groups.pl
- '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
- mv bin/*_*/* bin
- rmdir bin/*_*
- ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
- rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
- ''}
- '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
- rm -rf bin/*_*
- ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
- rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
- ''}
- '' else "");
-
- installPhase = ''
- runHook preInstall
- mkdir -p $GOROOT_FINAL
- cp -a bin pkg src lib misc api doc $GOROOT_FINAL
- ln -s $GOROOT_FINAL/bin $out/bin
- runHook postInstall
- '';
-
- disallowedReferences = [ goBootstrap ];
-
- meta = with lib; {
- homepage = "https://go.dev/";
- description = "The Go Programming language";
- license = licenses.bsd3;
- maintainers = teams.golang.members ++ [ maintainers._3noch ];
- platforms = platforms.linux ++ platforms.darwin;
- };
-}
diff --git a/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch b/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch
deleted file mode 100644
index a5be2685998e..000000000000
--- a/pkgs/development/compilers/go/ssl-cert-file-2-dev.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
-index 05593bb105..a6a11eeec1 100644
---- a/src/crypto/x509/root_darwin.go
-+++ b/src/crypto/x509/root_darwin.go
-@@ -11,6 +11,7 @@ import (
- "bytes"
- macOS "crypto/x509/internal/macos"
- "fmt"
-+ "io/ioutil"
- "os"
- "strings"
- )
-@@ -22,6 +23,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
- }
-
- func loadSystemRoots() (*CertPool, error) {
-+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+ data, err := ioutil.ReadFile(file)
-+ if err == nil {
-+ roots := NewCertPool()
-+ roots.AppendCertsFromPEM(data)
-+ return roots, nil
-+ }
-+ }
- var trustedRoots []*Certificate
- untrustedRoots := make(map[string]bool)
-
-diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
-index dede825edd..ffb3caf4a4 100644
---- a/src/crypto/x509/root_unix.go
-+++ b/src/crypto/x509/root_unix.go
-@@ -9,6 +9,7 @@ package x509
-
- import (
- "io/fs"
-+ "io/ioutil"
- "os"
- "path/filepath"
- "strings"
-@@ -32,6 +33,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
-
- func loadSystemRoots() (*CertPool, error) {
- roots := NewCertPool()
-+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
-+ data, err := ioutil.ReadFile(file)
-+ if err == nil {
-+ roots.AppendCertsFromPEM(data)
-+ return roots, nil
-+ }
-+ }
-
- files := certFiles
- if f := os.Getenv(certFileEnv); f != "" {
-
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index a85df6b23c0f..bdd8a6e71ade 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -129,6 +129,11 @@ extra-packages:
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6
- SVGFonts < 1.8 # 2022-03-19: Needed for Chart-diagrams 1.9.3
- clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0
+ - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format
+ - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format
+ - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
+ - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
+ - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
package-maintainers:
abbradar:
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6e19adf80ce3..316b6e924128 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -143433,6 +143433,22 @@ self: {
broken = true;
}) {};
+ "hspec_2_7_10" = callPackage
+ ({ mkDerivation, base, hspec-core, hspec-discover
+ , hspec-expectations, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec";
+ version = "2.7.10";
+ sha256 = "0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw";
+ libraryHaskellDepends = [
+ base hspec-core hspec-discover hspec-expectations QuickCheck
+ ];
+ description = "A Testing Framework for Haskell";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hspec" = callPackage
({ mkDerivation, base, hspec-core, hspec-discover
, hspec-expectations, QuickCheck
@@ -143519,6 +143535,34 @@ self: {
license = lib.licenses.mit;
}) {};
+ "hspec-core_2_7_10" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+ , deepseq, directory, filepath, hspec-expectations, hspec-meta
+ , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+ , silently, stm, temporary, tf-random, transformers
+ }:
+ mkDerivation {
+ pname = "hspec-core";
+ version = "2.7.10";
+ sha256 = "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1";
+ libraryHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm tf-random transformers
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations hspec-meta HUnit process QuickCheck
+ quickcheck-io random setenv silently stm temporary tf-random
+ transformers
+ ];
+ testToolDepends = [ hspec-meta ];
+ testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+ description = "A Testing Framework for Haskell";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hspec-core" = callPackage
({ mkDerivation, ansi-terminal, array, base, base-orphans
, call-stack, clock, deepseq, directory, filepath
@@ -143594,6 +143638,27 @@ self: {
license = lib.licenses.bsd3;
}) {};
+ "hspec-discover_2_7_10" = callPackage
+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec-discover";
+ version = "2.7.10";
+ sha256 = "13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [ base directory filepath ];
+ testHaskellDepends = [
+ base directory filepath hspec-meta QuickCheck
+ ];
+ testToolDepends = [ hspec-meta ];
+ description = "Automatically discover and run Hspec tests";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ maintainers = with lib.maintainers; [ maralorn ];
+ }) {};
+
"hspec-discover" = callPackage
({ mkDerivation, base, directory, filepath, hspec-meta, mockery
, QuickCheck
@@ -143757,6 +143822,24 @@ self: {
broken = true;
}) {};
+ "hspec-golden_0_1_0_3" = callPackage
+ ({ mkDerivation, base, directory, hspec, hspec-core
+ , optparse-applicative, silently
+ }:
+ mkDerivation {
+ pname = "hspec-golden";
+ version = "0.1.0.3";
+ sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory hspec-core ];
+ executableHaskellDepends = [ base directory optparse-applicative ];
+ testHaskellDepends = [ base directory hspec hspec-core silently ];
+ description = "Golden tests for hspec";
+ license = lib.licenses.mit;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"hspec-golden" = callPackage
({ mkDerivation, base, directory, filepath, hspec, hspec-core
, optparse-applicative, silently
@@ -267167,6 +267250,25 @@ self: {
license = lib.licenses.mit;
}) {};
+ "tasty-hspec_1_1_6" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "tasty-hspec";
+ version = "1.1.6";
+ sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl";
+ revision = "1";
+ editedCabalFile = "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj";
+ libraryHaskellDepends = [
+ base hspec hspec-core QuickCheck tasty tasty-quickcheck
+ tasty-smallcheck
+ ];
+ description = "Hspec support for the Tasty test framework";
+ license = lib.licenses.bsd3;
+ hydraPlatforms = lib.platforms.none;
+ }) {};
+
"tasty-hspec" = callPackage
({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
, tasty-quickcheck, tasty-smallcheck
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 1001dc62673a..081da52b8049 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -22,13 +22,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2022.Q1.3";
+ version = "2022.Q2.1";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "UBvHWgC/s00XPn87DAmQ65NszFMoZSXwbrVG064HFng=";
+ sha256 = "MJTpPzmIcTf4/RNte1oDYmn6/wLUJrHM2igrGgXIVqI=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix
index bf737972612b..3222702f5a1a 100644
--- a/pkgs/development/libraries/civetweb/default.nix
+++ b/pkgs/development/libraries/civetweb/default.nix
@@ -30,8 +30,9 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
- "-DCIVETWEB_ENABLE_CXX=ON"
"-DBUILD_SHARED_LIBS=ON"
+ "-DCIVETWEB_ENABLE_CXX=ON"
+ "-DCIVETWEB_ENABLE_IPV6=ON"
# The civetweb unit tests rely on downloading their fork of libcheck.
"-DCIVETWEB_BUILD_TESTING=OFF"
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index 6873508eb7dc..0c2a07149d20 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
"--with-blas=${openblas}"
];
+ enableParallelBuilding = true;
+
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix
index 081ddaf4988a..049d79c7025e 100644
--- a/pkgs/development/libraries/libjxl/default.nix
+++ b/pkgs/development/libraries/libjxl/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
- doCheck = true;
+ doCheck = !stdenv.hostPlatform.isi686;
# The test driver runs a test `LibraryCLinkageTest` which without
# LD_LIBRARY_PATH setting errors with:
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 83eb77b603c5..026465c97ae8 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,6 +1,10 @@
{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU
, libGL, glew, ocl-icd, python3
, cudaSupport ? config.cudaSupport or false, cudatoolkit
+ # For visibility mostly. The whole approach to cuda architectures and capabilities
+ # will be reworked soon.
+, cudaArch ? "compute_37"
+, openclSupport ? !cudaSupport
, darwin
}:
@@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
xorg.libXinerama xorg.libXi
]
- ++ lib.optional (!stdenv.isDarwin) ocl-icd
+ ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ])
++ lib.optional cudaSupport cudatoolkit;
@@ -37,8 +41,10 @@ stdenv.mkDerivation rec {
"-DGLEW_INCLUDE_DIR=${glew.dev}/include"
"-DGLEW_LIBRARY=${glew.dev}/lib"
] ++ lib.optionals cudaSupport [
- "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"
+ "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=${cudaArch}"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
+ ] ++ lib.optionals (!openclSupport) [
+ "-DNO_OPENCL=1"
];
postInstall = "rm $out/lib/*.a";
@@ -46,6 +52,7 @@ stdenv.mkDerivation rec {
meta = {
description = "An Open-Source subdivision surface library";
homepage = "http://graphics.pixar.com/opensubdiv";
+ broken = openclSupport && cudaSupport;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.eelco ];
license = lib.licenses.asl20;
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index a06df2b1950d..048f26bc7d6a 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
- version = "3.16.5";
+ version = "3.17.0";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
- sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw=";
+ sha256 = "sha256-ltWspoThzhQliRpiDSeHc8JWEcsUQWWpOxdTEjjqr4o=";
};
mpiSupport = !withp4est || p4est.mpiSupport;
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index c24c336c7289..2d6f6ef8d292 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -4,7 +4,7 @@
, curl
}:
let
- version = "2020.3.12";
+ version = "2020.3.13";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140=";
+ sha256 = "sha256-3AmQb9qLGBD+LLIrX1Fx0gi6kBxbnTkLrW0fP9ZsUeg=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 9536cc25290e..779705561009 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -1,35 +1,27 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
-let
- pname = "cmdliner";
-in
-
-assert lib.versionAtLeast ocaml.version "4.01.0";
-
-let param =
- if lib.versionAtLeast ocaml.version "4.03" then {
- version = "1.0.4";
- sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
- } else {
- version = "1.0.2";
- sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
- }
-; in
+assert (lib.versionAtLeast ocaml.version "4.03");
stdenv.mkDerivation rec {
- name = "ocaml${ocaml.version}-${pname}-${version}";
- inherit (param) version;
+ pname = "cmdliner";
+ version = "1.0.4";
src = fetchurl {
url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
- inherit (param) sha256;
+ sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
};
- nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ];
- buildInputs = [ topkg ];
- propagatedBuildInputs = [ result ];
+ nativeBuildInputs = [ ocaml ];
- inherit (topkg) buildPhase installPhase;
+ makeFlags = [ "PREFIX=$(out)" ];
+ installTargets = "install install-doc";
+ installFlags = [
+ "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}"
+ "DOCDIR=$(out)/share/doc/${pname}"
+ ];
+ postInstall = ''
+ mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam}
+ '';
meta = with lib; {
homepage = "https://erratique.ch/software/cmdliner";
diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix
index 66f12ffd54b0..3fc547ddf967 100644
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@@ -91,6 +91,8 @@ buildPythonPackage rec {
# aarch64-only (?) failure, unknown reason so far
# https://github.com/adobe-type-tools/afdko/issues/1425
"test_spec"
+ ] ++ lib.optionals (stdenv.hostPlatform.isi686) [
+ "test_type1mm_inputs"
];
passthru.tests = {
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index d42f242438b3..68cc3150d9f6 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "aioswitcher";
- version = "2.0.8";
+ version = "2.0.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "TomerFi";
repo = pname;
- rev = version;
- sha256 = "sha256-4+XGSaHZNYjId0bTOwCkYpb1K/pM8WtN5/NI+GVaI7M=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-vsMQG664ySMQfdl4tGJKMY0MZXVl39QaFxu7kMtZWCM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix
index cd4984861432..667e5fff5e19 100644
--- a/pkgs/development/python-modules/amberelectric/default.nix
+++ b/pkgs/development/python-modules/amberelectric/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "amberelectric";
- version = "1.0.3";
+ version = "1.0.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1hsbk2v7j1nsa083j28jb7b3rv76flan0g9wav97qccp1gjds5b0";
+ sha256 = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 1c818d2724ea..0f1a578c20d0 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
- version = "0.23.5";
+ version = "0.27.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
- sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc=";
+ sha256 = "sha256-QElc4J2BxOFI+L9D/SVMiYeRVOmwrNTW65LgdBG0TbU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index c79dc8b3fcb1..3ebc44d1c4d6 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -1,33 +1,141 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, isPy27
-, numpy
-, ffmpeg
+, fetchFromGitHub
+, pythonOlder
+
+# build
+, cython
, pkg-config
+
+# runtime
+, ffmpeg
+
+# tests
+, numpy
+, pillow
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "av";
- version = "8.1.0";
- disabled = isPy27; # setup.py no longer compatible
+ version = "9.1.1";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "0402169bc27e38e0f44e0e0e1854cf488337e86206b6d25d6dae2bfd7a1a0230";
+ src = fetchFromGitHub {
+ owner = "mikeboers";
+ repo = "PyAV";
+ rev = "v${version}";
+ hash = "sha256-/6C5GE9zANPy0xaptu/+pIupOLDra/R7TJ41YLGszUs=";
};
- checkInputs = [ numpy ];
+ nativeBuildInputs = [
+ cython
+ pkg-config
+ ];
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ffmpeg ];
+ buildInputs = [
+ ffmpeg
+ ];
- # Tests require downloading files from internet
- doCheck = false;
+ preCheck = ''
+ # ensure we import the built version
+ rm -r av
+ '';
- meta = {
+ checkInputs = [
+ numpy
+ pillow
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ # Tests that want to download FATE data
+ # https://github.com/PyAV-Org/PyAV/issues/955
+ "--deselect=tests/test_audiofifo.py::TestAudioFifo::test_data"
+ "--deselect=tests/test_codec_context.py::TestCodecContext::test_codec_tag"
+ "--deselect=tests/test_codec_context.py::TestCodecContext::test_parse"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_aac"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dnxhd"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_dvvideo"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_h264"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mjpeg"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mp2"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg1video"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_mpeg4"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_pcm_s24le"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_png"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_tiff"
+ "--deselect=tests/test_codec_context.py::TestEncoding::test_encoding_xvid"
+ "--deselect=tests/test_decode.py::TestDecode::test_decode_audio_sample_count"
+ "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors"
+ "--deselect=tests/test_decode.py::TestDecode::test_decoded_motion_vectors_no_flag"
+ "--deselect=tests/test_decode.py::TestDecode::test_decoded_time_base"
+ "--deselect=tests/test_decode.py::TestDecode::test_decoded_video_frame_count"
+ "--deselect=tests/test_encode.py::TestBasicAudioEncoding::test_transcode"
+ "--deselect=tests/test_file_probing.py::TestAudioProbe::test_container_probing"
+ "--deselect=tests/test_file_probing.py::TestAudioProbe::test_stream_probing"
+ "--deselect=tests/test_file_probing.py::TestDataProbe::test_container_probing"
+ "--deselect=tests/test_file_probing.py::TestDataProbe::test_stream_probing"
+ "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_container_probing"
+ "--deselect=tests/test_file_probing.py::TestSubtitleProbe::test_stream_probing"
+ "--deselect=tests/test_file_probing.py::TestVideoProbe::test_container_probing"
+ "--deselect=tests/test_file_probing.py::TestVideoProbe::test_stream_probing"
+ "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer"
+ "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_buffer_no_see"
+ "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_file"
+ "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_pipe_readonly"
+ "--deselect=tests/test_python_io.py::TestPythonIO::test_reading_from_write_readonl"
+ "--deselect=tests/test_seek.py::TestSeek::test_decode_half"
+ "--deselect=tests/test_seek.py::TestSeek::test_seek_end"
+ "--deselect=tests/test_seek.py::TestSeek::test_seek_float"
+ "--deselect=tests/test_seek.py::TestSeek::test_seek_int64"
+ "--deselect=tests/test_seek.py::TestSeek::test_seek_middle"
+ "--deselect=tests/test_seek.py::TestSeek::test_seek_start"
+ "--deselect=tests/test_seek.py::TestSeek::test_stream_seek"
+ "--deselect=tests/test_streams.py::TestStreams::test_selection"
+ "--deselect=tests/test_streams.py::TestStreams::test_stream_tuples"
+ "--deselect=tests/test_subtitles.py::TestSubtitle::test_movtext"
+ "--deselect=tests/test_subtitles.py::TestSubtitle::test_vobsub"
+ "--deselect=tests/test_videoframe.py::TestVideoFrameImage::test_roundtrip"
+ ];
+
+ disabledTestPaths = [
+ # urlopen fails during DNS resolution
+ "tests/test_doctests.py"
+ "tests/test_timeout.py"
+ ];
+
+ pythonImportsCheck = [
+ "av"
+ "av.audio"
+ "av.buffer"
+ "av.bytesource"
+ "av.codec"
+ "av.container"
+ "av._core"
+ "av.datasets"
+ "av.descriptor"
+ "av.dictionary"
+ "av.enum"
+ "av.error"
+ "av.filter"
+ "av.format"
+ "av.frame"
+ "av.logging"
+ "av.option"
+ "av.packet"
+ "av.plane"
+ "av.stream"
+ "av.subtitles"
+ "av.utils"
+ "av.video"
+ ];
+
+ meta = with lib; {
description = "Pythonic bindings for FFmpeg/Libav";
homepage = "https://github.com/mikeboers/PyAV/";
- license = lib.licenses.bsd2;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix
index a5e06a4f54f2..861f9ccd0f9b 100644
--- a/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -5,16 +5,20 @@
, azure-common
, azure-core
, msrestazure
+, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-eventgrid";
- version = "4.7.1";
+ version = "4.8.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "b96afc0317c764c2c428512485305ec5748698081cb6bc70dcaa903b0ac04754";
+ hash = "sha256-8jEtTQTUJLSa2iuA/Sgirgcm8kbwWOT11O1n46CLouw=";
};
propagatedBuildInputs = [
@@ -26,7 +30,10 @@ buildPythonPackage rec {
# has no tests
doCheck = false;
- pythonImportsCheck = [ "azure.eventgrid" ];
+
+ pythonImportsCheck = [
+ "azure.eventgrid"
+ ];
meta = with lib; {
description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model";
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index cd7e96049d1f..8bc69d0c9b72 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -3,18 +3,20 @@
, fetchPypi
, azure-mgmt-common
, azure-mgmt-core
-, isPy3k
+, pythonOlder
}:
buildPythonPackage rec {
- version = "19.1.0";
+ version = "20.0.0";
pname = "azure-mgmt-storage";
- disabled = !isPy3k;
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY=";
+ hash = "sha256-buR2tWIv9vWVTt7m6w2N1CezIXAihVrfHshjPKBM3uI=";
};
propagatedBuildInputs = [
@@ -22,9 +24,13 @@ buildPythonPackage rec {
azure-mgmt-core
];
- pythonNamespaces = [ "azure.mgmt" ];
+ pythonNamespaces = [
+ "azure.mgmt"
+ ];
- pythonImportsCheck = [ "azure.mgmt.storage" ];
+ pythonImportsCheck = [
+ "azure.mgmt.storage"
+ ];
# has no tests
doCheck = false;
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index b7dbfca70e8a..1b40d506abc1 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+{ config, lib, buildPythonPackage, fetchFromGitHub, isPy3k
, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions
-, cupy, cudaSupport ? false
+, cupy, cudaSupport ? config.cudaSupport or false
}:
buildPythonPackage rec {
@@ -39,6 +39,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A flexible framework of neural networks for deep learning";
homepage = "https://chainer.org/";
+ # Un-break me when updating chainer next time!
+ broken = cudaSupport && (lib.versionAtLeast cupy.version "8.0.0");
license = licenses.mit;
maintainers = with maintainers; [ hyphon81 ];
};
diff --git a/pkgs/development/python-modules/dotmap/default.nix b/pkgs/development/python-modules/dotmap/default.nix
index b0627160e3ee..5c4cfbf95240 100644
--- a/pkgs/development/python-modules/dotmap/default.nix
+++ b/pkgs/development/python-modules/dotmap/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "dotmap";
- version = "1.3.29";
+ version = "1.3.30";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-5mhR+Ey8RrruucUIt5LxBNM6OBUWbLy5jNOWg6tzxRE=";
+ hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix
new file mode 100644
index 000000000000..c7450d6b6b5b
--- /dev/null
+++ b/pkgs/development/python-modules/gattlib/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, substituteAll
+
+# build
+, pkg-config
+, glibc
+, python
+
+# runtime
+, bluez
+, boost
+, glib
+
+}:
+
+let
+ pname = "gattlib";
+ version = "unstable-2021-06-16";
+in
+buildPythonPackage {
+ inherit pname version;
+ format = "setuptools";
+
+
+ src = fetchFromGitHub {
+ owner = "oscaracena";
+ repo = "pygattlib";
+ rev = "7bdb229124fe7d9f4a2cc090277b0fdef82e2a56";
+ hash = "sha256-PS5DIH1JuH2HweyebLLM+UNFGY/XsjKIrsD9x7g7yMI=";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./setup.patch;
+ boost_version = let
+ pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
+ in
+ "boost_python${pythonVersion}";
+ })
+ ];
+
+ nativeBuildInputs = [
+ pkg-config
+ glibc
+ ];
+
+ buildInputs = [
+ bluez
+ boost
+ glib
+ ];
+
+ # has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "gattlib"
+ ];
+
+ meta = with lib; {
+ description = "Python library to use the GATT Protocol for Bluetooth LE devices";
+ homepage = "https://github.com/oscaracena/pygattlib";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/gattlib/setup.patch b/pkgs/development/python-modules/gattlib/setup.patch
new file mode 100644
index 000000000000..32c3b1be496d
--- /dev/null
+++ b/pkgs/development/python-modules/gattlib/setup.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 0825241..389a59e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -11,12 +11,7 @@ extension_modules = []
+
+
+ def get_boost_version(out=None):
+- if out is None:
+- out = subprocess.check_output(
+- r"ldconfig -p | grep -E 'libboost_python.*\.so '", shell=True)
+-
+- ver = os.path.splitext(out.split()[0][3:])[0].decode()
+- return ver
++ return "@boost_version@"
+
+ def tests():
+ # case: python3-py3x.so
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 5f9fdb2833d2..9ba7f9145e30 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -10,16 +10,19 @@
, mock
, proto-plus
, pytest-asyncio
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-pubsub";
- version = "2.11.0";
+ version = "2.12.0";
format = "setuptools";
+ disabled = pythonOlder "3.6";
+
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM=";
+ hash = "sha256-5RoIpyVm/y2+6pN4mJPWHbVUwxH6yWI/vIuCVNJU2aw=";
};
propagatedBuildInputs = [
@@ -47,7 +50,9 @@ buildPythonPackage rec {
"tests/unit/pubsub_v1"
];
- pythonImportsCheck = [ "google.cloud.pubsub" ];
+ pythonImportsCheck = [
+ "google.cloud.pubsub"
+ ];
meta = with lib; {
description = "Google Cloud Pub/Sub API client library";
diff --git a/pkgs/development/python-modules/ha-av/default.nix b/pkgs/development/python-modules/ha-av/default.nix
deleted file mode 100644
index 78735b67d44d..000000000000
--- a/pkgs/development/python-modules/ha-av/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, pkg-config
-, ffmpeg_4
-}:
-
-buildPythonPackage rec {
- pname = "ha-av";
- version = "8.0.4rc1";
- format = "setuptools";
-
- disabled = pythonOlder "3.5";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-txdi2/X6upqrACeHhHpEh4tGqgPpW/dyWda8y++7c3M=";
- };
-
- nativeBuildInputs = [
- pkg-config
- ];
-
- buildInputs = [
- ffmpeg_4
- ];
-
- pythonImportsCheck = [
- "av"
- "av._core"
- ];
-
- # tests fail to import av._core
- doCheck = false;
-
- meta = with lib; {
- homepage = "https://pypi.org/project/ha-av/";
- description = "Pythonic bindings for FFmpeg's libraries";
- license = licenses.bsd3;
- maintainers = with maintainers; [ hexa ];
- };
-}
diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix
index 3b5e0a218b78..18dd31f8af56 100644
--- a/pkgs/development/python-modules/hangups/default.nix
+++ b/pkgs/development/python-modules/hangups/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "hangups";
- version = "0.4.17";
+ version = "0.4.18";
disabled = pythonOlder "3.6";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "tdryer";
repo = "hangups";
rev = "v${version}";
- hash = "sha256-8kNWcRAip9LkmazDUVeDjGWhy/TWzT01c959LA5hb1Q=";
+ hash = "sha256-vq1OrOUPMQtezBFlisP2f/bvvYprDjhOuwUcT8rmIvw=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index 719efb92d1da..7837deea6dba 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
+, pythonAtLeast
, poetry-core
, pytest-aiohttp
, pytest-asyncio
@@ -11,15 +12,15 @@
buildPythonPackage rec {
pname = "hyperion-py";
- version = "0.7.4";
- disabled = pythonOlder "3.8";
+ version = "0.7.5";
+ disabled = pythonOlder "3.8" || pythonAtLeast "3.10";
format = "pyproject";
src = fetchFromGitHub {
owner = "dermotduffy";
repo = pname;
rev = "v${version}";
- sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj";
+ sha256 = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/json-home-client/default.nix b/pkgs/development/python-modules/json-home-client/default.nix
new file mode 100644
index 000000000000..be3d99904dcd
--- /dev/null
+++ b/pkgs/development/python-modules/json-home-client/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+# build inputs
+, typing-extensions
+, uri-template
+}:
+
+buildPythonPackage rec {
+ pname = "json-home-client";
+ version = "1.1.1";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "plinss";
+ repo = "json_home_client";
+ rev = "v${version}";
+ sha256 = "sha256-DhnvvY1nMe1sdRE+OgjBt4TsLmiqnD8If4rl700zW9E=";
+ };
+
+ postPatch = ''
+ sed -i -e 's/0.0.0/${version}/' setup.py
+ '';
+
+ propagatedBuildInputs = [
+ typing-extensions
+ uri-template
+ ];
+
+ pythonImportsCheck = [ "json_home_client" ];
+
+ meta = with lib; {
+ description = "Client class for calling http+json APIs in Python";
+ homepage = "https://github.com/plinss/json_home_client";
+ license = licenses.mit;
+ maintainers = [ maintainers.kvark ];
+ };
+}
diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix
new file mode 100644
index 000000000000..b075ead34297
--- /dev/null
+++ b/pkgs/development/python-modules/lru-dict/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
+
+let
+ pname = "lru-dict";
+ version = "1.1.7";
+in
+buildPythonPackage {
+ inherit pname version;
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-RbgfZ9dTQdRDOrreeZpH6cQqniKhGFMdy15UmGQDLXw=";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "lru"
+ ];
+
+ meta = with lib; {
+ description = "Fast and memory efficient LRU cache for Python";
+ homepage = "https://github.com/amitdev/lru-dict";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index 47f4d80ad927..a9e778bdd8c6 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -6,10 +6,11 @@
, graphviz
, python
, isPy3k
+, isPy310
}:
buildPythonPackage {
- inherit (pkgs.mxnet) pname version src meta;
+ inherit (pkgs.mxnet) pname version src;
buildInputs = [ pkgs.mxnet ];
propagatedBuildInputs = [ requests numpy graphviz ];
@@ -32,4 +33,7 @@ buildPythonPackage {
ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet
'';
+ meta = pkgs.mxnet.meta // {
+ broken = (pkgs.mxnet.broken or false) || (isPy310 && pkgs.mxnet.cudaSupport);
+ };
}
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index cc2601e4a227..d5e10f32a192 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.16.6";
+ version = "0.17.3";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "v${version}";
- sha256 = "sha256-hAYbYsLpiiJYdg9Rx5BjqNA9JTtKGu3DE0SpwOxlTWw=";
+ sha256 = "sha256-1wSVmH7woTR2ebHS5FfWHLqwbY04rxtPx/0A/HY+N8s=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index eae35b5bac6d..db598b368c5b 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pre-commit-hooks";
- version = "4.1.0";
+ version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pre-commit";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-nxJp7LkCUkJj77RCeWedBusue3x0lZYatSidbueZqfo=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-jSu4LutEgpeAbCgSHgk6VXQKLZo00T3TrQVZxsNU1co=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix
index ae90c21bea9f..55262a07a4ca 100644
--- a/pkgs/development/python-modules/pybluez/default.nix
+++ b/pkgs/development/python-modules/pybluez/default.nix
@@ -1,32 +1,45 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
-, pkgs
-, isPy3k
+, bluez
+, gattlib
}:
buildPythonPackage rec {
- version = "unstable-20160819";
pname = "pybluez";
- # requires use2to3, which is no longer supported in setuptools>58
- disabled = isPy3k;
-
- propagatedBuildInputs = [ pkgs.bluez ];
+ version = "unstable-2022-01-28";
+ format = "setuptools";
src = fetchFromGitHub {
- owner = "karulis";
+ owner = pname;
repo = pname;
- rev = "a0b226a61b166e170d48539778525b31e47a4731";
- sha256 = "104dm5ngfhqisv1aszdlr3szcav2g3bhsgzmg4qfs09b3i5zj047";
+ rev = "5096047f90a1f6a74ceb250aef6243e144170f92";
+ hash = "sha256-GA58DfCFaVzZQA1HYpGQ68bznrt4SX1ojyOVn8hyCGo=";
};
- # the tests do not pass
+ buildInputs = [
+ bluez
+ ];
+
+ propagatedBuildInputs = [
+ gattlib
+ ];
+
+ # there are no tests
doCheck = false;
+ pythonImportsCheck = [
+ "bluetooth"
+ "bluetooth.ble"
+ ];
+
meta = with lib; {
description = "Bluetooth Python extension module";
+ homepage = "https://github.com/pybluez/pybluez";
license = licenses.gpl2;
maintainers = with maintainers; [ leenaars ];
+ broken = stdenv.isDarwin; # requires pyobjc-core, pyobjc-framework-Cocoa
};
}
diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix
index c47362e339e5..f7d45a31490b 100644
--- a/pkgs/development/python-modules/pycfmodel/default.nix
+++ b/pkgs/development/python-modules/pycfmodel/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pycfmodel";
- version = "0.18.0";
+ version = "0.18.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
- rev = version;
- hash = "sha256-g249Nq4u4pPQLbW9Kw5vLwVKCaZoots5LD6yk1NPv6s=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-oP9u62PpnBCDAwE9LJHkm93f9eYyXbHai/gp62bL84M=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index 81fc1d5709e9..efad8aaca948 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pysma";
- version = "0.6.10";
+ version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "990abf6dba3f52b98970fc95aaf484e521faa9ff28c9c19f5a6dca3fddf5840c";
+ sha256 = "sha256-x0sFJAdueSny0XoaOYbYLN8ZRS5B/iEVT62mqd4Voe4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix
new file mode 100644
index 000000000000..95fcc8295b22
--- /dev/null
+++ b/pkgs/development/python-modules/result/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "result";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "rustedpy";
+ repo = "result";
+ rev = "v${version}";
+ sha256 = "sha256-bEf3OJg6ksDvzZE7ezA58Q2FObb5V7BG8vkKtX284Jg=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace '"--flake8",' "" \
+ --replace '"--tb=short",' "" \
+ --replace '"--cov=result",' "" \
+ --replace '"--cov=tests",' "" \
+ --replace '"--cov-report=term",' "" \
+ --replace '"--cov-report=xml",' ""
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [
+ #TODO: figure out the failure "match o:" Invalid Syntax
+ "tests/test_pattern_matching.py"
+ ];
+
+ pythonImportsCheck = [ "result" ];
+
+ meta = with lib; {
+ description = "A simple Result type for Python 3 inspired by Rust, fully type annotated";
+ homepage = "https://github.com/rustedpy/result";
+ license = licenses.mit;
+ maintainers = [ maintainers.kvark ];
+ };
+}
diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix
index cd137b1547ea..05dc36947650 100644
--- a/pkgs/development/python-modules/samsungtvws/default.nix
+++ b/pkgs/development/python-modules/samsungtvws/default.nix
@@ -1,6 +1,8 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
+, aiohttp
, requests
, websocket-client
+, websockets
}:
buildPythonPackage rec {
@@ -14,8 +16,10 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- websocket-client
+ aiohttp
requests
+ websocket-client
+ websockets
];
# no tests
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index b1c0346b9648..af6132cd2771 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "toggl-cli";
- version = "3";
+ version = "2.4.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "togglCli";
inherit version;
- sha256 = "sha256-SkA/u1q//AyYn0v6uAXXsjANhFppxxjKhlhWhsK649w=";
+ sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo=";
};
nativeBuildInputs = [
@@ -58,8 +58,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "notify-py==0.3.1" "notify-py>=0.3.1" \
- --replace "click==7.1.2" "click>=7.1.2" \
- --replace "pbr==5.5.1" "pbr>=5.5.1"
+ --replace "click==8.0.3" "click>=8.0.3" \
+ --replace "pbr==5.8.0" "pbr>=5.8.0" \
+ --replace "inquirer==2.9.1" "inquirer>=2.9.1"
substituteInPlace pytest.ini \
--replace ' --cov toggl -m "not premium"' ""
'';
diff --git a/pkgs/development/python-modules/uri-template/default.nix b/pkgs/development/python-modules/uri-template/default.nix
new file mode 100644
index 000000000000..19f61989e5c2
--- /dev/null
+++ b/pkgs/development/python-modules/uri-template/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python }:
+
+buildPythonPackage rec {
+ pname = "uri-template";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "plinss";
+ repo = "uri_template";
+ rev = "v${version}";
+ sha256 = "sha256-IAq6GpEwimq45FU0QugLZLSOhwAmC1KbpZKD0zyxsUs=";
+ };
+
+ postPatch = ''
+ sed -i -e 's/0.0.0/${version}/' setup.py
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} test.py
+ '';
+
+ pythonImportsCheck = [ "uri_template" ];
+
+ meta = with lib; {
+ description = "An implementation of RFC 6570 URI Templates";
+ homepage = "https://github.com/plinss/uri_template/";
+ license = licenses.mit;
+ maintainers = [ maintainers.kvark ];
+ };
+}
diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix
index a56cc4ca8b43..7328494a61ff 100644
--- a/pkgs/development/python-modules/vehicle/default.nix
+++ b/pkgs/development/python-modules/vehicle/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "vehicle";
- version = "0.3.1";
+ version = "0.4.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-vehicle";
rev = "v${version}";
- sha256 = "04xcs5bfjd49j870gyyznc8hkaadsa9gm9pz0w9qvzlphnxvv5h4";
+ sha256 = "sha256-dvSdYrONUEe+bdZ+9nALrOQ6gJwq9e1dLvuq08xP5tQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix
index 1f9aad67f19d..df7d37929263 100644
--- a/pkgs/development/python-modules/west/default.nix
+++ b/pkgs/development/python-modules/west/default.nix
@@ -1,16 +1,24 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k
-, colorama, configobj, packaging, pyyaml, pykwalify
+{ lib
+, buildPythonPackage
+, colorama
+, configobj
+, fetchPypi
+, packaging
+, pykwalify
+, pythonOlder
+, pyyaml
}:
buildPythonPackage rec {
- version = "0.12.0";
pname = "west";
+ version = "0.13.0";
+ format = "setuptools";
- disabled = !isPy3k;
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d7ce0d719fd218fee5983442fe93a33a21a6be6a736915a7ffbe75369714e9ce";
+ hash = "sha256-jlOmeIM6NfgYykjhgs7KpnAXFMbT/lpbT/bBaJ2CGY4=";
};
propagatedBuildInputs = [
@@ -24,12 +32,12 @@ buildPythonPackage rec {
# pypi package does not include tests (and for good reason):
# tests run under 'tox' and have west try to git clone repos (not sandboxable)
doCheck = false;
+
pythonImportsCheck = [
"west"
];
meta = with lib; {
- homepage = "https://github.com/zephyrproject-rtos/west";
description = "Zephyr RTOS meta tool";
longDescription = ''
West lets you manage multiple Git repositories under a single directory using a single file,
@@ -47,6 +55,7 @@ buildPythonPackage rec {
For more details, see Multiple Repository Management in the west documentation
(https://docs.zephyrproject.org/latest/guides/west/repo-tool.html).
'';
+ homepage = "https://github.com/zephyrproject-rtos/west";
license = licenses.asl20;
maintainers = with maintainers; [ siriobalmelli ];
};
diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix
new file mode 100644
index 000000000000..d11fa492ca57
--- /dev/null
+++ b/pkgs/development/python-modules/widlparser/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+# build inputs
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+ pname = "widlparser";
+ version = "1.0.12";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "plinss";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-T17fDWYd1naza/ao7kXWGcRIl2fzL1/Z9SaJiutZzqk=";
+ };
+
+ postPatch = ''
+ sed -i -e 's/0.0.0/${version}/' setup.py
+ '';
+
+ propagatedBuildInputs = [
+ typing-extensions
+ ];
+
+ pythonImportsCheck = [ "widlparser" ];
+
+ meta = with lib; {
+ description = "Stand-alone WebIDL Parser in Python";
+ homepage = "https://github.com/plinss/widlparser";
+ license = licenses.mit;
+ maintainers = [ maintainers.kvark ];
+ };
+}
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index b2bfeea8f7a9..6269c52c664b 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, cryptography
, netifaces
, voluptuous
, pyyaml
@@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
- version = "0.19.2";
+ version = "0.20.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,13 +21,12 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = version;
- sha256 = "sha256-LJ7MmKCWx+n7caud0pN4+7f9H4XzwuAAn9u86X/FACo=";
+ sha256 = "sha256-7g1uAkBGlNcmfjqGNH2MS+X26Pq1hTKQy9eLJVTqxhA=";
};
propagatedBuildInputs = [
- voluptuous
+ cryptography
netifaces
- pyyaml
];
checkInputs = [
diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix
index b64bd929f13f..b2c019889483 100644
--- a/pkgs/development/python-modules/yeelight/default.nix
+++ b/pkgs/development/python-modules/yeelight/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "yeelight";
- version = "0.7.9";
+ version = "0.7.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "stavros";
repo = "python-yeelight";
rev = "v${version}";
- sha256 = "sha256-8N+HOhUX3BXecS/kaAfLoge+NYzKLKPyoTthu+useJA=";
+ sha256 = "sha256-vUsL1CvhYRtv75gkmiPe/UkAtBDZPy1iK2BPUupMXz8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix
index 6795ba581273..361966ef458f 100644
--- a/pkgs/development/python-modules/youtube-search-python/default.nix
+++ b/pkgs/development/python-modules/youtube-search-python/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "youtube-search-python";
- version = "1.6.3";
+ version = "1.6.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-zAza1XMKLIMZFFS0v/4ATqh6j7aEB2Y+eliE/hNPORw=";
+ hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix
index 5bcbf24dc302..4792f38d7ce1 100644
--- a/pkgs/development/python-modules/yq/default.nix
+++ b/pkgs/development/python-modules/yq/default.nix
@@ -4,8 +4,10 @@
, substituteAll
, argcomplete
, pyyaml
+, toml
, xmltodict
, jq
+, setuptools-scm
, pytestCheckHook
}:
@@ -25,14 +27,14 @@ buildPythonPackage rec {
})
];
- postPatch = ''
- substituteInPlace test/test.py \
- --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
- '';
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
propagatedBuildInputs = [
pyyaml
xmltodict
+ toml
argcomplete
];
@@ -44,13 +46,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "yq" ];
- doInstallCheck = true;
- installCheckPhase = ''
- echo '{"hello":{"foo":"bar"}}' | $out/bin/yq -y . | grep 'foo: bar'
- '';
-
meta = with lib; {
- description = "Command-line YAML processor - jq wrapper for YAML documents";
+ description = "Command-line YAML/XML/TOML processor - jq wrapper for YAML, XML, TOML documents";
homepage = "https://github.com/kislyuk/yq";
license = licenses.asl20;
maintainers = with maintainers; [ womfoo SuperSandro2000 ];
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 56d2704fcc19..881523b14d25 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.67";
+ version = "0.0.69";
src = fetchFromGitHub {
owner = "zigpy";
repo = "zha-device-handlers";
rev = version;
- sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA=";
+ sha256 = "sha256-qPqgla+NFtZ85i+GB0lRRsoNImVghJsJfww7j8yQcFs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix
index 79b9d910053a..376b74c266cb 100644
--- a/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -25,7 +25,6 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- pyserial
pyserial-asyncio
zigpy
];
@@ -36,6 +35,12 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ "test_incoming_msg"
+ "test_incoming_msg2"
+ "test_deser"
+ ];
+
meta = with lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
homepage = "https://github.com/zigpy/zigpy-cc";
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 20d5237f76e8..0a152c3825a1 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "zigpy";
- version = "0.43.0";
+ version = "0.44.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = version;
- sha256 = "1740cv99ny6xy7wfpz754h4wj2cm874b8vnddvff90ajk07qgdia";
+ sha256 = "sha256-7X3uaxzvVMhSucCGA+rZsgt+fJSNjYQkJLpCGyHOIlc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix
index 71a9a95d2fca..6945ea8ca708 100644
--- a/pkgs/development/tools/analysis/actionlint/default.nix
+++ b/pkgs/development/tools/analysis/actionlint/default.nix
@@ -10,7 +10,7 @@
buildGoModule rec {
pname = "actionlint";
- version = "1.6.10";
+ version = "1.6.11";
subPackages = [ "cmd/actionlint" ];
@@ -18,10 +18,10 @@ buildGoModule rec {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
- sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU=";
+ sha256 = "sha256-BlJxgRDnAlfM/81qAEGEW09luScivYSDf5w2lR8hQUA=";
};
- vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I=";
+ vendorSha256 = "sha256-nG0u5hZ/YRn+yUoEGTBo6ZdOp0e+sH6Jl9F+QhpfYAU=";
nativeBuildInputs = [ makeWrapper ronn installShellFiles ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 2d97b64b11e8..d9d973d0ff50 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U=";
};
+ makeFlags = [ "FLOW_RELEASE=1" ];
+
installPhase = ''
install -Dm755 bin/flow $out/bin/flow
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix
index 58e048b4f5fe..848601488364 100644
--- a/pkgs/development/tools/faas-cli/default.nix
+++ b/pkgs/development/tools/faas-cli/default.nix
@@ -9,13 +9,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
- version = "0.14.3";
+ version = "0.14.4";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
- sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo=";
+ sha256 = "sha256-hpQn1lEJP0FmU1jhmXDgV/11RbMdEqblLPIrTQLKLOc=";
};
CGO_ENABLED = 0;
@@ -35,6 +35,6 @@ buildGoModule rec {
homepage = "https://github.com/openfaas/faas-cli";
description = "Official CLI for OpenFaaS ";
license = licenses.mit;
- maintainers = with maintainers; [ welteki ];
+ maintainers = with maintainers; [ welteki techknowlogick ];
};
}
diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix
index 144c159f3637..d48c5ace3e36 100644
--- a/pkgs/development/tools/kotlin-language-server/default.nix
+++ b/pkgs/development/tools/kotlin-language-server/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "kotlin-language-server";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
- sha256 = "sha256-GXr+sOGa09qeQrfaJYRPsoHULwfMst8tTr4y2cv752k=";
+ sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY=";
};
dontBuild = true;
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 92cab080aa80..49bf3f35ad87 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -1,16 +1,14 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kustomize";
version = "4.5.4";
- # rev is the commit of the tag, mainly for kustomize version command output
- rev = "cf3a452ddd6f83945d39d582243b8592ec627ae3";
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
[
"-s"
"-X ${t}.version=${version}"
- "-X ${t}.gitCommit=${rev}"
+ "-X ${t}.gitCommit=${src.rev}"
];
src = fetchFromGitHub {
@@ -20,13 +18,20 @@ buildGoModule rec {
sha256 = "sha256-7Ode+ONgWJRNSbIpvIjhuT+oVvZgJfByFqS/iSUhcXw=";
};
- doCheck = true;
-
# avoid finding test and development commands
- sourceRoot = "source/kustomize";
+ modRoot = "kustomize";
vendorSha256 = "sha256-beIbeY/+k2NgotGw5zQFkYuqMKlwctoxuToZfiFlCm4=";
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installShellCompletion --cmd kustomize \
+ --bash <($out/bin/kustomize completion bash) \
+ --fish <($out/bin/kustomize completion fish) \
+ --zsh <($out/bin/kustomize completion zsh)
+ '';
+
meta = with lib; {
description = "Customization of kubernetes YAML configurations";
longDescription = ''
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index e7abf32eae5f..44d9782f3ce5 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ocaml-findlib";
- version = "1.9.1";
+ version = "1.9.3";
src = fetchurl {
url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
- sha256 = "sha256-K0K4vVRIjWTEvzy3BUtLN70wwdwSvUMeoeTXrYqYD+I=";
+ sha256 = "sha256:0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463";
};
nativeBuildInputs = [m4 ocaml];
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index dbdb0edd6cb1..e961b3059065 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -6,7 +6,7 @@
mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
- files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
+ files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \
+ findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \
+ findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix
index 3b47823b9b43..7ac62a9e7852 100644
--- a/pkgs/development/tools/stagit/default.nix
+++ b/pkgs/development/tools/stagit/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "stagit";
- version = "1.0";
+ version = "1.1";
src = fetchgit {
url = "git://git.codemadness.org/stagit";
rev = version;
- sha256 = "sha256-4QSKW89RyK/PpGE+lOHFiMTI82pdspfObnzd0rcgQkg=";
+ sha256 = "sha256-wnXvK1OYd6FxJuZai5a0Mvz4gWpjlhLgGrcKlvn2lbs=";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix
index 6e839617034d..6e80c62b7817 100644
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vultr-cli";
- version = "2.12.1";
+ version = "2.12.2";
src = fetchFromGitHub {
owner = "vultr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s=";
+ sha256 = "sha256-ylSzPfBTIFZXLLxj/LHkzTNqpDZvT43UKIiG4y/aQJQ=";
};
vendorSha256 = null;
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 822bfcbe5936..d28507247eec 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.3.8";
+ version = "2022.4.0";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -22,6 +22,7 @@
"airthings" = ps: with ps; [ airthings-cloud ];
"airtouch4" = ps: with ps; [ airtouch4pyapi ];
"airvisual" = ps: with ps; [ pyairvisual ];
+ "airzone" = ps: with ps; [ aioairzone ];
"aladdin_connect" = ps: with ps; [ aladdin-connect ];
"alarm_control_panel" = ps: with ps; [ ];
"alarmdecoder" = ps: with ps; [ adext ];
@@ -36,7 +37,7 @@
"ambient_station" = ps: with ps; [ aioambient ];
"amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
"ampio" = ps: with ps; [ asmog ];
- "analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+ "analytics" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ];
"android_ip_webcam" = ps: with ps; [ pydroid-ipcam ];
"androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
@@ -76,13 +77,12 @@
"azure_devops" = ps: with ps; [ aioazuredevops ];
"azure_event_hub" = ps: with ps; [ azure-eventhub ];
"azure_service_bus" = ps: with ps; [ azure-servicebus ];
+ "backup" = ps: with ps; [ aiohttp-cors ]; # missing inputs: securetar
"baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip
"balboa" = ps: with ps; [ pybalboa ];
"bayesian" = ps: with ps; [ ];
- "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
"bbox" = ps: with ps; [ ]; # missing inputs: pybbox
"beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim
- "bh1750" = ps: with ps; [ i2csense smbus-cffi ];
"binary_sensor" = ps: with ps; [ ];
"bitcoin" = ps: with ps; [ blockchain ];
"bizkaibus" = ps: with ps; [ bizkaibus ];
@@ -90,16 +90,12 @@
"blebox" = ps: with ps; [ blebox-uniapi ];
"blink" = ps: with ps; [ blinkpy ];
"blinksticklight" = ps: with ps; [ BlinkStick ];
- "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt
"blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api
"bloomsky" = ps: with ps; [ ];
"blueprint" = ps: with ps; [ ];
"bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ pygatt ];
"bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ];
- "bme280" = ps: with ps; [ bme280spi i2csense smbus-cffi ];
- "bme680" = ps: with ps; [ bme680 smbus-cffi ];
- "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ bimmer-connected ];
"bond" = ps: with ps; [ bond-api ];
"bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ];
@@ -130,7 +126,7 @@
"clickatell" = ps: with ps; [ ];
"clicksend" = ps: with ps; [ ];
"clicksend_tts" = ps: with ps; [ ];
- "climacell" = ps: with ps; [ pyclimacell ];
+ "climacell" = ps: with ps; [ pyclimacell ]; # missing inputs: pytomorrowio
"climate" = ps: with ps; [ ];
"cloud" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ];
"cloudflare" = ps: with ps; [ pycfdns ];
@@ -165,10 +161,10 @@
"deconz" = ps: with ps; [ pydeconz ];
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
- "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ];
+ "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client fnvhash hass-nabucasa home-assistant-frontend ifaddr lru-dict pillow pyserial pyudev scapy sqlalchemy zeroconf ];
"delijn" = ps: with ps; [ pydelijn ];
"deluge" = ps: with ps; [ deluge-client ];
- "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+ "demo" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ];
"denon" = ps: with ps; [ ];
"denonavr" = ps: with ps; [ denonavr ];
"derivative" = ps: with ps; [ ];
@@ -180,7 +176,6 @@
"devolo_home_network" = ps: with ps; [ devolo-plc-api ];
"dexcom" = ps: with ps; [ pydexcom ];
"dhcp" = ps: with ps; [ aiodiscover scapy ];
- "dht" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-dht
"diagnostics" = ps: with ps; [ aiohttp-cors ];
"dialogflow" = ps: with ps; [ aiohttp-cors ];
"digital_ocean" = ps: with ps; [ digital-ocean ];
@@ -234,13 +229,12 @@
"emulated_hue" = ps: with ps; [ aiohttp-cors ifaddr ];
"emulated_kasa" = ps: with ps; [ sense-energy ];
"emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ];
- "energy" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+ "energy" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ];
"enigma2" = ps: with ps; [ openwebifpy ];
"enocean" = ps: with ps; [ enocean ];
"enphase_envoy" = ps: with ps; [ envoy-reader ];
"entur_public_transport" = ps: with ps; [ enturclient ];
"environment_canada" = ps: with ps; [ env-canada ];
- "envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat
"envisalink" = ps: with ps; [ pyenvisalink ];
"ephember" = ps: with ps; [ pyephember ];
"epson" = ps: with ps; [ epson-projector ];
@@ -268,7 +262,7 @@
"fido" = ps: with ps; [ pyfido ];
"file" = ps: with ps; [ ];
"filesize" = ps: with ps; [ ];
- "filter" = ps: with ps; [ sqlalchemy ];
+ "filter" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"fints" = ps: with ps; [ fints ];
"fireservicerota" = ps: with ps; [ pyfireservicerota ];
"firmata" = ps: with ps; [ pymata-express ];
@@ -303,18 +297,18 @@
"fritzbox" = ps: with ps; [ pyfritzhome ];
"fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
"fronius" = ps: with ps; [ pyfronius ];
- "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
+ "frontend" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
"frontier_silicon" = ps: with ps; [ afsapi ];
"futurenow" = ps: with ps; [ pyfnip ];
"garadget" = ps: with ps; [ ];
"garages_amsterdam" = ps: with ps; [ garages-amsterdam ];
"gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
"gdacs" = ps: with ps; [ aio-georss-gdacs ];
- "generic" = ps: with ps; [ ];
+ "generic" = ps: with ps; [ av pillow ];
"generic_hygrostat" = ps: with ps; [ ];
- "generic_thermostat" = ps: with ps; [ sqlalchemy ];
+ "generic_thermostat" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"geniushub" = ps: with ps; [ geniushub-client ];
- "geo_json_events" = ps: with ps; [ geojson-client ];
+ "geo_json_events" = ps: with ps; [ ]; # missing inputs: aio_geojson_generic_client
"geo_location" = ps: with ps; [ ];
"geo_rss_events" = ps: with ps; [ georss-generic-client ];
"geofency" = ps: with ps; [ aiohttp-cors ];
@@ -329,7 +323,7 @@
"goalzero" = ps: with ps; [ goalzero ];
"gogogate2" = ps: with ps; [ ismartgate ];
"goodwe" = ps: with ps; [ goodwe ];
- "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];
+ "google" = ps: with ps; [ aiohttp-cors google-api-python-client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ];
"google_cloud" = ps: with ps; [ google-cloud-texttospeech ];
"google_domains" = ps: with ps; [ ];
@@ -353,7 +347,7 @@
"hangouts" = ps: with ps; [ hangups ];
"harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
"harmony" = ps: with ps; [ aioharmony ];
- "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
+ "hassio" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
"haveibeenpwned" = ps: with ps; [ ];
"hddtemp" = ps: with ps; [ ];
"hdmi_cec" = ps: with ps; [ pycec ];
@@ -363,8 +357,8 @@
"hikvision" = ps: with ps; [ ]; # missing inputs: pyhik
"hikvisioncam" = ps: with ps; [ hikvision ];
"hisense_aehw4a1" = ps: with ps; [ pyaehw4a1 ];
- "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
- "history_stats" = ps: with ps; [ sqlalchemy ];
+ "history" = ps: with ps; [ aiohttp-cors fnvhash lru-dict sqlalchemy ];
+ "history_stats" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"hitron_coda" = ps: with ps; [ ];
"hive" = ps: with ps; [ pyhiveapi ];
"hlk_sw16" = ps: with ps; [ hlk-sw16 ];
@@ -382,7 +376,6 @@
"hp_ilo" = ps: with ps; [ python-hpilo ];
"html5" = ps: with ps; [ aiohttp-cors pywebpush ];
"http" = ps: with ps; [ aiohttp-cors ];
- "htu21d" = ps: with ps; [ i2csense smbus-cffi ];
"huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ];
"hue" = ps: with ps; [ aiohue ];
"huisbaasje" = ps: with ps; [ huisbaasje-client ];
@@ -436,6 +429,7 @@
"joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api
"juicenet" = ps: with ps; [ python-juicenet ];
"kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client
+ "kaleidescape" = ps: with ps; [ ]; # missing inputs: pykaleidescape
"kankun" = ps: with ps; [ ];
"keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact
"keenetic_ndms2" = ps: with ps; [ ndms2-client ];
@@ -477,7 +471,7 @@
"local_ip" = ps: with ps; [ aiohttp-cors ifaddr ];
"locative" = ps: with ps; [ aiohttp-cors ];
"lock" = ps: with ps; [ ];
- "logbook" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
+ "logbook" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
"logentries" = ps: with ps; [ ];
"logger" = ps: with ps; [ ];
"logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle
@@ -497,13 +491,12 @@
"mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner
"manual" = ps: with ps; [ ];
"manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
- "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
+ "map" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
"marytts" = ps: with ps; [ ]; # missing inputs: speak2mary
"mastodon" = ps: with ps; [ mastodon-py ];
"matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ maxcube-api ];
"mazda" = ps: with ps; [ pymazda ];
- "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx
"media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
"media_player" = ps: with ps; [ aiohttp-cors ];
"media_source" = ps: with ps; [ aiohttp-cors ];
@@ -519,7 +512,6 @@
"meteoclimatic" = ps: with ps; [ pymeteoclimatic ];
"metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
"mfi" = ps: with ps; [ ]; # missing inputs: mficlient
- "mhz19" = ps: with ps; [ pmsensor ];
"microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts
"microsoft_face" = ps: with ps; [ pyturbojpeg aiohttp-cors ];
"microsoft_face_detect" = ps: with ps; [ pyturbojpeg aiohttp-cors ];
@@ -543,7 +535,6 @@
"moon" = ps: with ps; [ ];
"motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr motionblinds ];
"motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ];
- "mpchc" = ps: with ps; [ ];
"mpd" = ps: with ps; [ mpd2 ];
"mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ];
@@ -554,7 +545,7 @@
"mullvad" = ps: with ps; [ mullvad-api ];
"mutesync" = ps: with ps; [ mutesync ];
"mvglive" = ps: with ps; [ PyMVGLive ];
- "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
+ "my" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
"myq" = ps: with ps; [ pymyq ];
"mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ];
@@ -609,7 +600,7 @@
"ohmconnect" = ps: with ps; [ defusedxml ];
"ombi" = ps: with ps; [ pyombi ];
"omnilogic" = ps: with ps; [ omnilogic ];
- "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
+ "onboarding" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
"oncue" = ps: with ps; [ aiooncue ];
"ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ];
"onewire" = ps: with ps; [ pi1wire pyownet ];
@@ -632,7 +623,6 @@
"openweathermap" = ps: with ps; [ pyowm ];
"opnsense" = ps: with ps; [ pyopnsense ];
"opple" = ps: with ps; [ ]; # missing inputs: pyoppleio
- "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO
"oru" = ps: with ps; [ ]; # missing inputs: oru
"orvibo" = ps: with ps; [ orvibo ];
"osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
@@ -640,29 +630,26 @@
"overkiz" = ps: with ps; [ pyoverkiz ];
"ovo_energy" = ps: with ps; [ ovoenergy ];
"owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ];
- "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ];
"p1_monitor" = ps: with ps; [ p1monitor ];
"panasonic_bluray" = ps: with ps; [ panacotta ];
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect ];
- "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
- "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
- "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a
+ "panel_custom" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
+ "panel_iframe" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend lru-dict pillow sqlalchemy ];
+ "peco" = ps: with ps; [ ]; # missing inputs: peco
"pencom" = ps: with ps; [ ]; # missing inputs: pencompy
"persistent_notification" = ps: with ps; [ ];
"person" = ps: with ps; [ aiohttp-cors pillow ];
"philips_js" = ps: with ps; [ ha-philipsjs ];
- "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx
"pi_hole" = ps: with ps; [ hole ];
"picnic" = ps: with ps; [ python-picnic-api ];
"picotts" = ps: with ps; [ ];
- "piglow" = ps: with ps; [ ]; # missing inputs: piglow
"pilight" = ps: with ps; [ ]; # missing inputs: pilight
"ping" = ps: with ps; [ icmplib ];
"pioneer" = ps: with ps; [ ];
"pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2
"plaato" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyplaato ];
- "plant" = ps: with ps; [ sqlalchemy ];
+ "plant" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ];
"plugwise" = ps: with ps; [ plugwise ];
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
@@ -706,11 +693,10 @@
"rainforest_eagle" = ps: with ps; [ aioeagle ueagle ];
"rainmachine" = ps: with ps; [ regenmaschine ];
"random" = ps: with ps; [ ];
- "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
"raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
"rdw" = ps: with ps; [ vehicle ];
"recollect_waste" = ps: with ps; [ aiorecollect ];
- "recorder" = ps: with ps; [ sqlalchemy ];
+ "recorder" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
"reddit" = ps: with ps; [ praw ];
"rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl
@@ -737,10 +723,7 @@
"rova" = ps: with ps; [ ]; # missing inputs: rova
"rpi_camera" = ps: with ps; [ ];
"rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO
- "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled
- "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio
"rpi_power" = ps: with ps; [ rpi-bad-power ];
- "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf
"rss_feed_template" = ps: with ps; [ aiohttp-cors ];
"rtorrent" = ps: with ps; [ ];
"rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors rtsp-to-webrtc ];
@@ -748,9 +731,9 @@
"russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
"russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
"sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd
- "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ];
+ "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors fnvhash hass-nabucasa home-assistant-frontend lru-dict pillow sqlalchemy ];
"saj" = ps: with ps; [ ]; # missing inputs: pysaj
- "samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ];
+ "samsungtv" = ps: with ps; [ aiohttp-cors async-upnp-client getmac ifaddr samsungctl samsungtvws wakeonlan zeroconf ];
"satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
"scene" = ps: with ps; [ ];
"schluter" = ps: with ps; [ ]; # missing inputs: py-schluter
@@ -763,23 +746,21 @@
"select" = ps: with ps; [ ];
"sendgrid" = ps: with ps; [ sendgrid ];
"sense" = ps: with ps; [ sense-energy ];
- "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
"senseme" = ps: with ps; [ aiosenseme ];
"sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
- "sensor" = ps: with ps; [ sqlalchemy ];
+ "sensor" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"sentry" = ps: with ps; [ sentry-sdk ];
"serial" = ps: with ps; [ pyserial-asyncio ];
"serial_pm" = ps: with ps; [ pmsensor ];
"sesame" = ps: with ps; [ ]; # missing inputs: pysesame2
"seven_segments" = ps: with ps; [ pillow ];
"seventeentrack" = ps: with ps; [ py17track ];
- "sharkiq" = ps: with ps; [ sharkiqpy ];
+ "sharkiq" = ps: with ps; [ ]; # missing inputs: sharkiq
"shell_command" = ps: with ps; [ ];
"shelly" = ps: with ps; [ aioshelly ];
"shiftr" = ps: with ps; [ paho-mqtt ];
"shodan" = ps: with ps; [ shodan ];
"shopping_list" = ps: with ps; [ aiohttp-cors ];
- "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
"sia" = ps: with ps; [ pysiaalarm ];
"sigfox" = ps: with ps; [ ];
"sighthound" = ps: with ps; [ pillow simplehound ];
@@ -799,7 +780,6 @@
"sma" = ps: with ps; [ pysma ];
"smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
"smart_meter_texas" = ps: with ps; [ smart-meter-texas ];
- "smarthab" = ps: with ps; [ smarthab ];
"smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pysmartapp pysmartthings ];
"smarttub" = ps: with ps; [ python-smarttub ];
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
@@ -809,7 +789,6 @@
"snapcast" = ps: with ps; [ snapcast ];
"snips" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"snmp" = ps: with ps; [ pysnmp ];
- "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
"solaredge" = ps: with ps; [ solaredge stringcase ];
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ sunwatcher ];
@@ -835,7 +814,7 @@
"starline" = ps: with ps; [ starline ];
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
"startca" = ps: with ps; [ xmltodict ];
- "statistics" = ps: with ps; [ sqlalchemy ];
+ "statistics" = ps: with ps; [ fnvhash lru-dict sqlalchemy ];
"statsd" = ps: with ps; [ statsd ];
"steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
"steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ];
@@ -854,6 +833,7 @@
"swiss_public_transport" = ps: with ps; [ python-opendata-transport ];
"swisscom" = ps: with ps; [ ];
"switch" = ps: with ps; [ ];
+ "switch_as_x" = ps: with ps; [ ];
"switchbot" = ps: with ps; [ pyswitchbot ];
"switcher_kis" = ps: with ps; [ aioswitcher ];
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
@@ -893,7 +873,7 @@
"thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner
"thomson" = ps: with ps; [ ];
"threshold" = ps: with ps; [ ];
- "tibber" = ps: with ps; [ pytibber sqlalchemy ];
+ "tibber" = ps: with ps; [ fnvhash lru-dict pytibber sqlalchemy ];
"tikteck" = ps: with ps; [ ]; # missing inputs: tikteck
"tile" = ps: with ps; [ pytile ];
"time_date" = ps: with ps; [ ];
@@ -901,9 +881,9 @@
"tmb" = ps: with ps; [ tmb ];
"tod" = ps: with ps; [ ];
"todoist" = ps: with ps; [ todoist ];
- "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2
"tolo" = ps: with ps; [ tololib ];
"tomato" = ps: with ps; [ ];
+ "tomorrowio" = ps: with ps; [ ]; # missing inputs: pytomorrowio
"toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ];
"torque" = ps: with ps; [ aiohttp-cors ];
"totalconnect" = ps: with ps; [ total-connect-client ];
@@ -940,6 +920,7 @@
"upb" = ps: with ps; [ upb-lib ];
"upc_connect" = ps: with ps; [ connect-box ];
"upcloud" = ps: with ps; [ upcloud-api ];
+ "update" = ps: with ps; [ ];
"updater" = ps: with ps; [ ];
"upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
"uptime" = ps: with ps; [ ];
@@ -971,6 +952,7 @@
"volkszaehler" = ps: with ps; [ volkszaehler ];
"volumio" = ps: with ps; [ pyvolumio ];
"volvooncall" = ps: with ps; [ volvooncall ];
+ "vulcan" = ps: with ps; [ vulcan-api ];
"vultr" = ps: with ps; [ vultr ];
"w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32
"wake_on_lan" = ps: with ps; [ wakeonlan ];
@@ -984,7 +966,7 @@
"waze_travel_time" = ps: with ps; [ wazeroutecalculator ];
"weather" = ps: with ps; [ ];
"webhook" = ps: with ps; [ aiohttp-cors ];
- "webostv" = ps: with ps; [ aiowebostv sqlalchemy ];
+ "webostv" = ps: with ps; [ aiowebostv ];
"websocket_api" = ps: with ps; [ aiohttp-cors ];
"wemo" = ps: with ps; [ pywemo ];
"whirlpool" = ps: with ps; [ whirlpool-sixth-sense ];
@@ -1022,7 +1004,7 @@
"youless" = ps: with ps; [ youless-api ];
"zabbix" = ps: with ps; [ py-zabbix ];
"zamg" = ps: with ps; [ ];
- "zengge" = ps: with ps; [ ]; # missing inputs: zengge
+ "zengge" = ps: with ps; [ bluepy ]; # missing inputs: zengge
"zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
"zerproc" = ps: with ps; [ pyzerproc ];
"zestimate" = ps: with ps; [ xmltodict ];
@@ -1032,7 +1014,6 @@
"zodiac" = ps: with ps; [ ];
"zone" = ps: with ps; [ ];
"zoneminder" = ps: with ps; [ zm-py ];
- "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
"zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ];
"zwave_me" = ps: with ps; [ aiohttp-cors ifaddr url-normalize zeroconf ]; # missing inputs: zwave_me_ws
};
@@ -1052,6 +1033,7 @@
"airthings"
"airtouch4"
"airvisual"
+ "airzone"
"alarm_control_panel"
"alarmdecoder"
"alert"
@@ -1107,7 +1089,6 @@
"canary"
"cast"
"cert_expiry"
- "climacell"
"climate"
"cloud"
"cloudflare"
@@ -1132,6 +1113,7 @@
"debugpy"
"deconz"
"default_config"
+ "deluge"
"demo"
"denonavr"
"derivative"
@@ -1145,6 +1127,7 @@
"diagnostics"
"dialogflow"
"directv"
+ "discord"
"discovery"
"dlna_dmr"
"dlna_dms"
@@ -1182,6 +1165,7 @@
"fan"
"feedreader"
"ffmpeg"
+ "fibaro"
"fido"
"file"
"filesize"
@@ -1215,7 +1199,6 @@
"generic"
"generic_hygrostat"
"generic_thermostat"
- "geo_json_events"
"geo_location"
"geo_rss_events"
"geofency"
@@ -1339,7 +1322,6 @@
"met"
"met_eireann"
"meteoclimatic"
- "mhz19"
"microsoft_face"
"microsoft_face_detect"
"microsoft_face_identify"
@@ -1409,7 +1391,6 @@
"overkiz"
"ovo_energy"
"owntracks"
- "ozw"
"p1_monitor"
"panel_custom"
"panel_iframe"
@@ -1478,7 +1459,6 @@
"sensor"
"sentry"
"seventeentrack"
- "sharkiq"
"shell_command"
"shelly"
"shopping_list"
@@ -1494,7 +1474,6 @@
"sma"
"smappee"
"smart_meter_texas"
- "smarthab"
"smartthings"
"smarttub"
"smhi"
@@ -1530,6 +1509,7 @@
"sun"
"surepetcare"
"switch"
+ "switch_as_x"
"switchbot"
"switcher_kis"
"syncthing"
@@ -1541,9 +1521,11 @@
"tado"
"tag"
"tailscale"
+ "tankerkoenig"
"tasmota"
"tcp"
"telegram"
+ "telegram_bot"
"tellduslive"
"template"
"tesla_wall_connector"
@@ -1553,6 +1535,7 @@
"time_date"
"timer"
"tod"
+ "todoist"
"tolo"
"tomato"
"toon"
@@ -1562,6 +1545,7 @@
"trace"
"tractive"
"tradfri"
+ "trafikverket_train"
"trafikverket_weatherstation"
"transmission"
"transport_nsw"
@@ -1578,6 +1562,7 @@
"universal"
"upb"
"upcloud"
+ "update"
"updater"
"upnp"
"uptime"
@@ -1599,6 +1584,7 @@
"vlc_telnet"
"voicerss"
"volumio"
+ "vulcan"
"vultr"
"wake_on_lan"
"wallbox"
@@ -1635,7 +1621,6 @@
"zha"
"zodiac"
"zone"
- "zwave"
"zwave_js"
];
}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 32273d35e7a7..ded617b35f6c 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -59,17 +59,18 @@ let
})
(self: super: {
- hatasmota = super.hatasmota.overridePythonAttrs (oldAttrs: {
- version = "0.3.1";
+ aioairzone = super.aioairzone.overridePythonAttrs (oldAttrs: rec {
+ version = "0.2.3";
src = fetchFromGitHub {
- owner = "emontnemery";
- repo = "hatasmota";
- rev = "0.3.1";
- sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw=";
+ owner = "Noltari";
+ repo = "aioairzone";
+ rev = version;
+ hash = "sha256-vy6NqtlWv2El259rC+Nm0gs/rsY+s8xe7Z+wXvT1Ing=";
};
});
})
+
(self: super: {
huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
version = "1.4.18";
@@ -177,7 +178,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.3.8";
+ hassVersion = "2022.4.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -195,7 +196,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ=";
+ hash = "sha256-b/YwcbcQuRIue4fr4+yF2EEXLvmnI7e3xfyz52flwJw=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@@ -215,8 +216,8 @@ in python.pkgs.buildPythonApplication rec {
"bcrypt"
"cryptography"
"httpx"
+ "jinja2"
"pip"
- "PyJWT"
"requests"
"yarl"
];
@@ -319,6 +320,8 @@ in python.pkgs.buildPythonApplication rec {
"test_merge"
# Tests are flaky
"test_config_platform_valid"
+ # Test requires pylint>=2.13.0
+ "test_invalid_discovery_info"
];
preCheck = ''
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 9f13a6652d7d..fb708313072c 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20220301.2";
+ version = "20220405.0";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
- sha256 = "sha256-iIywlG9ATLV/+bHtOQFx4mRwToelpPdE3DOKSp4yxN0=";
+ sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";
};
# there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index ae2d91b933f9..58bb1670e5a0 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -5,14 +5,14 @@
let
# some components' tests have additional dependencies
extraCheckInputs = with home-assistant.python.pkgs; {
- alexa = [ ha-av ];
- camera = [ ha-av ];
+ alexa = [ av ];
+ camera = [ av ];
cloud = [ mutagen ];
config = [ pydispatcher ];
- generic = [ ha-av ];
+ generic = [ av ];
google_translate = [ mutagen ];
lovelace = [ PyChromecast ];
- nest = [ ha-av ];
+ nest = [ av ];
onboarding = [ pymetno radios rpi-bad-power ];
version = [ aioaseko ];
voicerss = [ mutagen ];
@@ -67,8 +67,11 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
meta = old.meta // {
broken = lib.elem component [
"airtouch4"
+ "bsblan"
"dnsip"
- "zwave"
+ "efergy"
+ "ssdp"
+ "subaru"
];
# upstream only tests on Linux, so do we.
platforms = lib.platforms.linux;
diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
index 0c5038898ea3..64565a57ff94 100644
--- a/pkgs/servers/http/envoy/default.nix
+++ b/pkgs/servers/http/envoy/default.nix
@@ -127,8 +127,9 @@ buildBazelPackage rec {
];
passthru.tests = {
- # No tests for Envoy itself (yet), but it's tested as a core component of Pomerium.
- inherit (nixosTests) pomerium;
+ envoy = nixosTests.envoy;
+ # tested as a core component of Pomerium
+ pomerium = nixosTests.pomerium;
};
meta = with lib; {
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index d9797de6d174..6f7723eb3448 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -19,11 +19,11 @@ let
in
stdenv.mkDerivation rec {
pname = "keycloak";
- version = "16.1.0";
+ version = "17.0.1";
src = fetchzip {
- url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
- sha256 = "sha256-QVFu3f+mwafoNUttLEVMdoZHMJjjH/TpZAGV7ZvIvh0=";
+ url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-legacy-${version}.zip";
+ sha256 = "sha256-oqANNk7T6+CAS818v3I1QNsuxetL/JFZMqxouRn+kdE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index ef4c22b1c2c0..84010a090368 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
, fetchYarnDeps, fixup_yarn_lock
+, fetchpatch
# Allow building a fork or custom version of Mastodon:
, pname ? "mastodon"
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Ngfs15YKLfSBOKju3BzpZFnenB370jId2G1g9Qy1y5w=";
};
+ patches = [
+ # Fix indexing statuses in ElasticSearch
+ (fetchpatch {
+ url = "https://github.com/mastodon/mastodon/commit/ef196c913c77338be5ebb1e02af2f6225f857080.patch";
+ sha256 = "sha256-uw8m6j4BzMQtev0LNLeIHW0xOJEmj3JikT/6gVfmvzs=";
+ })
+ ];
+
mastodon-gems = bundlerEnv {
name = "${pname}-gems-${version}";
inherit version;
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index ffe76b25b191..30d45a89b134 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.55.2";
+ version = "1.56.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-MCdwatNo4cDAaq9a3UFwSLJzT1ZxhoYqPOu/a957D2Y=";
+ sha256 = "sha256-MWMCGgsWJqIO4xefIHxp/mtR7yxLrJOfTsb2hxlGeiY=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix
index 32c7ac21dae4..a0115440b6ec 100644
--- a/pkgs/servers/nitter/default.nix
+++ b/pkgs/servers/nitter/default.nix
@@ -2,14 +2,14 @@
nimPackages.buildNimPackage rec {
pname = "nitter";
- version = "unstable-2022-02-11";
+ version = "unstable-2022-03-21";
nimBinOnly = true;
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
- rev = "6695784050605c77a301c0a66764fa9a9580a2f5";
- sha256 = "1lddzf6m74bw5kkv465cp211xxqbwnfacav7ia3y9i38rrnqwk6m";
+ rev = "6884f05041a9b8619ec709afacdfdd6482a120a0";
+ sha256 = "1mnc6jqljpqp9lgcrxxvf3aiswssr34v139cxfbwlmj45swmsazh";
};
buildInputs = with nimPackages; [
diff --git a/pkgs/servers/nitter/update.sh b/pkgs/servers/nitter/update.sh
new file mode 100755
index 000000000000..e756eff5fb98
--- /dev/null
+++ b/pkgs/servers/nitter/update.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p common-updater-scripts curl jq nix nix-prefetch-git patchutils
+set -euo pipefail
+
+info() {
+ if [ -t 2 ]; then
+ set -- '\033[32m%s\033[39m\n' "$@"
+ else
+ set -- '%s\n' "$@"
+ fi
+ printf "$@" >&2
+}
+
+nitter_old_version=$(nix-instantiate --eval --strict --json -A nitter.version . | jq -r .)
+nitter_old_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .)
+today=$(LANG=C date -u +'%Y-%m-%d')
+
+# use latest commit before today, we should not call the version *today*
+# because there might still be commits coming
+# use the day of the latest commit we picked as version
+commit=$(curl -Sfs "https://api.github.com/repos/zedeus/nitter/compare/$nitter_old_rev~1...master" \
+ | jq '.commits | map(select(.commit.committer.date < $today) | {sha, date: .commit.committer.date}) | .[-1]' --arg today "$today")
+nitter_new_rev=$(jq -r '.sha' <<< "$commit")
+nitter_new_version="unstable-$(jq -r '.date[0:10]' <<< "$commit")"
+info "latest commit before $today: $nitter_new_rev ($(jq -r '.date' <<< "$commit"))"
+
+if [ "$nitter_new_rev" = "$nitter_old_rev" ]; then
+ info "nitter is up-to-date."
+ exit
+fi
+
+if curl -Sfs "https://github.com/zedeus/nitter/compare/$nitter_old_rev...$nitter_new_rev.patch" \
+| lsdiff | grep -Fxe 'a/nitter.nimble' -e 'b/nitter.nimble' > /dev/null; then
+ info "nitter.nimble changed, some dependencies probably need updating."
+fi
+
+nitter_new_sha256=$(nix-prefetch-git --rev "$nitter_new_rev" "https://github.com/zedeus/nitter.git" | jq -r .sha256)
+update-source-version nitter "$nitter_new_version" "$nitter_new_sha256" --rev="$nitter_new_rev"
+git commit --all --verbose --message "nitter: $nitter_old_version -> $nitter_new_version"
+info "Updated nitter to $nitter_new_version."
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1b777d96696b..05453444650e 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2022-04-04";
+ version = "2022-04-06";
pname = "oh-my-zsh";
- rev = "4d9e5ce9a7d8db3c3aadcae81580a5c3ff5a0e8b";
+ rev = "b3999a4b156185b617a5608317497399f88dc8fe";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "Plg7mr6ZOSzUpq5XMFkebVpCjdtwe237+4sVdtL+kLM=";
+ sha256 = "yXM+fLdNWOrUU03K7527NgtaAwSql5r0wPaWgUZqGhY=";
};
installPhase = ''
diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index f0840d158535..d31cb6a0ef66 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
- doCheck = false;
-
meta = with lib; {
description = "A utility to examine and validate certificates in a variety of formats";
homepage = "https://github.com/square/certigo";
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index 484cbbb82cbd..20929f5d8d5f 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-C3xnBANsymSgI7l446CjJzEMY1gURGTxDNBBjNjHmaE=";
- doCheck = false;
-
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 3e0ab7568183..df96da11d105 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.90.0";
+ version = "0.91.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-XQZ32Gg/LZCDuSmtGvDEYCuzvq39zzq3yGGTYSKZyXI=";
+ sha256 = "sha256-Hz/joHOzy71ZtbpoTjomccSgc49VyWACTC9EwSiDpzc=";
};
- vendorSha256 = "sha256-IYqeuyNPRQBMwuZMW4InKfHpOLhleM5Mz5Oauw4nK6M=";
+ vendorSha256 = "sha256-rkEVtIHXD5lXj8r89vhoWhJZF3unvwB43Zz3jBHRjYU=";
doCheck = false;
diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix
index 436e77ed5f16..0d6d2f57df14 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/pkgs/tools/admin/pebble/default.nix
@@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "pebble";
- version = "2.3.0";
+ version = "2.3.1";
goPackagePath = "github.com/letsencrypt/${pname}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "letsencrypt";
repo = pname;
rev = "v${version}";
- sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2";
+ sha256 = "sha256-S9+iRaTSRt4F6yMKK0OJO6Zto9p0dZ3q/mULaipudVo=";
};
passthru.tests = {
diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix
new file mode 100644
index 000000000000..afafbca58baf
--- /dev/null
+++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix
@@ -0,0 +1,46 @@
+{ rustPlatform
+, cloud-utils
+, fetchFromGitHub
+, lib
+, llvmPackages
+, pkg-config
+, util-linux
+, zfs
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "zpool-auto-expand-partitions";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "DeterminateSystems";
+ repo = "zpool-auto-expand-partitions";
+ rev = "v${version}";
+ hash = "sha256-LA6YO6vv7VCXwFfayQVxVR80niSCo89sG0hqh0wDEh8=";
+ };
+
+ cargoHash = "sha256-5v0fqp8aro+QD/f5VudMREc8RvKQapNAoArcCKMN1Sw=";
+
+ preBuild = ''
+ substituteInPlace src/grow.rs \
+ --replace '"growpart"' '"${cloud-utils}/bin/growpart"'
+ substituteInPlace src/lsblk.rs \
+ --replace '"lsblk"' '"${util-linux}/bin/lsblk"'
+ '';
+
+ nativeBuildInputs = [
+ pkg-config
+ rustPlatform.bindgenHook
+ ];
+
+ buildInputs = [
+ util-linux
+ zfs
+ ];
+
+ meta = with lib; {
+ description = "A tool that aims to expand all partitions in a specified zpool to fill the available space";
+ homepage = "https://github.com/DeterminateSystems/zpool-auto-expand-partitions";
+ license = licenses.asl20;
+ maintainers = teams.determinatesystems.members;
+ };
+}
diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix
index ce68e9f82098..32d1c5500b80 100644
--- a/pkgs/tools/misc/ethminer/default.nix
+++ b/pkgs/tools/misc/ethminer/default.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ fetchpatch,
fetchFromGitHub,
opencl-headers,
cmake,
@@ -31,6 +32,21 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = [
+ # global context library is separated from libethash
+ ./add-global-context.patch
+
+ # CUDA 11 no longer support SM30
+ (fetchpatch {
+ url = "https://github.com/ethereum-mining/ethminer/commit/dae359dff28f376d4ce7ddfbd651dcd34d6dad8f.patch";
+ hash = "sha256-CJGKc0rXOcKDX1u5VBzc8gyBi1Me9CNATfQzKViqtAA=";
+ })
+ ];
+
+ postPatch = ''
+ sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
+ '';
+
# NOTE: dbus is broken
cmakeFlags = [
"-DHUNTER_ENABLED=OFF"
@@ -64,15 +80,6 @@ stdenv.mkDerivation rec {
cudatoolkit
];
- patches = [
- # global context library is separated from libethash
- ./add-global-context.patch
- ];
-
- preConfigure = ''
- sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
- '';
-
postInstall = ''
wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib
'';
diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix
index 979569dc3329..66bb319b5a5a 100644
--- a/pkgs/tools/misc/interactsh/default.nix
+++ b/pkgs/tools/misc/interactsh/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "interactsh";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-czXcncEm2Wm0ezGjNOpcCin5KOZKuimnnMPUWfGE0FY=";
+ sha256 = "sha256-AtWcVzY/1DnKRva/PGISTHmBsWpJ6nxJvlWR/B/fRcE=";
};
- vendorSha256 = "sha256-YfHsl0AFNQNCg4HEP9FyrHUMMz0SFn5aDRrOruseE5k=";
+ vendorSha256 = "sha256-LV5K4fToE26i4Av/YcNPjIyYmf/kxmBMuiyXYYfL3Y4=";
modRoot = ".";
subPackages = [
diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix
index c85b884c50d3..614dc30ed8e7 100644
--- a/pkgs/tools/misc/sfeed/default.nix
+++ b/pkgs/tools/misc/sfeed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "sfeed";
- version = "1.3";
+ version = "1.4";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
- sha256 = "sha256-XOBzvVOOv84LzFNiLOnmJWm552igGLNFB2i3eMeWaW8=";
+ sha256 = "sha256-fn+PE0WwBdllsO1gXbM2Ftdrl8ua/v50Ny4C/J4OK8Q=";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index d440a55f334b..2b0fdb190786 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
- version = "3.19.0";
+ version = "3.19.1";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
- sha256 = "sha256-mhz+SjJwVsosbfJLnFUBt4y6W+afQFokciuBrFpfC48=";
+ sha256 = "sha256-URl0I2jtiw27IZSkxa0JR313+Et6OIZPB9SeRf2tqnk=";
};
- vendorSha256 = "sha256-DGeMSyyucdU1FGRfil3I12UZ4DR1nQWD9oEDRhWQQzo=";
+ vendorSha256 = "sha256-emWAUxgM8HrDo5ThzqNlinUg6aEwh5TyOOTEQjM53wc=";
outputs = [ "out" "wordlists" ];
diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index df6a63159371..80082a223e57 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -2,18 +2,16 @@
buildGo118Module rec {
pname = "corerad";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "mdlayher";
repo = "corerad";
rev = "v${version}";
- sha256 = "sha256-2XPWexpr3xGwnvjT08BVq6uf1haPuZGwKswiy/1Z8vE=";
+ sha256 = "sha256-1v7jAYLIflXIKY0zltzkre4sNv9qqWxFGWrQuOBr2s0=";
};
- vendorSha256 = "sha256-+9KjgbKuAJexdGEKu9hIsHfHsVbKeB5ZtSgFzM2/bOI=";
-
- doCheck = false;
+ vendorSha256 = "sha256-oS9nI1BELDLFksN+NbLT1Eklg67liOvcRbxtGdYGJJA=";
# Since the tarball pulled from GitHub doesn't contain git tag information,
# we fetch the expected tag's timestamp from a file in the root of the
@@ -36,5 +34,6 @@ buildGo118Module rec {
description = "Extensible and observable IPv6 NDP RA daemon";
license = licenses.asl20;
maintainers = with maintainers; [ mdlayher ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 158129c2c1f4..6295c4562b0b 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
- version = "7.2.0";
+ version = "8.0.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
- sha256 = "sha256-NhsEXYEYoRZ/HlMS+MP/N+ZxB13DDZr5B8MY5dbONP0=";
+ sha256 = "sha256-Bk3p8+FkjrF/nLsPRx8daqieV8iewAbcoO2DglFSERg=";
};
- cargoSha256 = "sha256-Y/DgAMWhTgHuhdbYxpsg7UxLF7hXNQEY1aoaUbKdDEM=";
+ cargoSha256 = "sha256-chHr/3yN2PLUQLYqkln12q3+n7tX2IclVGpXBCkPxCQ=";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index ed61740a6849..50ac8c7a8afe 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
- version = "1.13.5";
+ version = "1.14.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
- sha256 = "sha256-0TKAchPDjB7YKJO2JqBwJPZITWXDQbjPbRN8amilJ6E=";
+ sha256 = "sha256-zWiC1GhrI3gcXhr8JpAbFF6t7N6aBSho33FMu8bhF2o=";
};
- cargoSha256 = "sha256-LBLUNBXsaGfviUUleoYIFf/vrbejKYwB9Lqetx3Agxc=";
+ cargoSha256 = "sha256-nSKeFLWTHhtmlvA9MV6NpupKJo3d1jKpTBI5H8cHJ9s=";
RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix
index 4883cc042cde..5542adca77af 100644
--- a/pkgs/tools/networking/termscp/default.nix
+++ b/pkgs/tools/networking/termscp/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "termscp";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "veeso";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fVZDpzgcpMWOoUtoq7go/NFWfoR1aONuRtTba0sqPZk=";
+ sha256 = "sha256-WqOkud8gOa81P6FT44y5RZX4CWjmou9HufZ3QPoYuAk=";
};
- cargoSha256 = "sha256-iLm73dWF9z/obtAXe5dZlvJcxU6hB5N0vaSc/HLuTuQ=";
+ cargoSha256 = "sha256-jckJiFhiUvbn0fkgKzqDorWQvuLenx/S8+RyPoqaWUg=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix
index 386b8cafbd12..98632f5e2a0f 100644
--- a/pkgs/tools/networking/xxh/default.nix
+++ b/pkgs/tools/networking/xxh/default.nix
@@ -10,7 +10,7 @@
buildPythonApplication rec{
pname = "xxh";
- version = "0.8.9";
+ version = "0.8.10";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonApplication rec{
owner = pname;
repo = pname;
rev = version;
- hash = "sha256-Uo7xFwE9e5MFWDlNWq15kg+4xf/hF4WGUNTpTK+rgVg=";
+ hash = "sha256-2RMzgIAhM//XReCFBGlTlXn9j4WQiM/k2pLxP2iPUy8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix
index d3d45e6bbb72..882275eca44d 100644
--- a/pkgs/tools/package-management/nix-doc/default.nix
+++ b/pkgs/tools/package-management/nix-doc/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-doc";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "lf-";
repo = "nix-doc";
- sha256 = "sha256-P4AX8ERsMHGkGowc05M7xE5HTFSmaJvD2z0Prz4emeQ=";
+ sha256 = "sha256-H8FNOOjHMUW2wIUfoDhS3eH2AgxxD0LAuX4J9SJyJhg=";
};
doCheck = true;
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "sha256-RxsH4bSAzBslK8MVGmCJxduf6MYOtQEKxt9QjgUCg1o=";
+ cargoSha256 = "sha256-BTMFoZ8HqbgUXkVyydOkcQZ10TLE8KsGRdt+xhBKJVc=";
meta = with lib; {
description = "An interactive Nix documentation tool";
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index bbeca94a993e..626afe7706a7 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.5.1";
+ version = "8.6.1";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lx7xjOajFyeetnGcJwX66pIcZw2A7+QGWb5crCoA83g=";
+ sha256 = "sha256-rXnP9vU8kHkMPl7Xur4pf3rvw12ADtkZxZnBO1LaFzs=";
};
vendorSha256 = "sha256-gelUrZOYiThO0+COIv9cOgho/tjv7ZqSKOktWIbdADw=";
diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/tools/security/truecrack/default.nix
index cf64b234c66f..40d0ba213fb9 100644
--- a/pkgs/tools/security/truecrack/default.nix
+++ b/pkgs/tools/security/truecrack/default.nix
@@ -33,6 +33,7 @@ gccStdenv.mkDerivation rec {
meta = with lib; {
description = "TrueCrack is a brute-force password cracker for TrueCrypt volumes. It works on Linux and it is optimized for Nvidia Cuda technology.";
homepage = "https://gitlab.com/kalilinux/packages/truecrack";
+ broken = cudaSupport;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ ethancedwards8 ];
diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix
index 5cfa00d5326f..221f7c3d5528 100644
--- a/pkgs/tools/text/asciigraph/default.nix
+++ b/pkgs/tools/text/asciigraph/default.nix
@@ -1,11 +1,9 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "asciigraph";
version = "0.5.3";
- goPackagePath = "github.com/guptarohit/asciigraph";
-
src = fetchFromGitHub {
owner = "guptarohit";
repo = pname;
@@ -13,10 +11,14 @@ buildGoPackage rec {
sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM=";
};
+ vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+
+ ldflags = [ "-s" "-w" ];
+
meta = with lib; {
homepage = "https://github.com/guptarohit/asciigraph";
description = "Lightweight ASCII line graph ╭┈╯ command line app";
license = licenses.bsd3;
- maintainers = [ maintainers.mmahut ];
+ maintainers = with maintainers; [ mmahut ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06010955d450..df45a0b496be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1071,6 +1071,8 @@ with pkgs;
cf-vault = callPackage ../tools/admin/cf-vault { };
+ bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
+
cope = callPackage ../tools/misc/cope { };
ejson2env = callPackage ../tools/admin/ejson2env { };
@@ -4625,7 +4627,7 @@ with pkgs;
cudatoolkit_11_5
cudatoolkit_11_6;
- cudatoolkit = cudatoolkit_10;
+ cudatoolkit = cudatoolkit_11;
cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
inherit (cudnnPackages)
@@ -4648,7 +4650,7 @@ with pkgs;
cudnn_8_3_cudatoolkit_11;
# Make sure to keep this in sync with the `cudatoolkit` version!
- cudnn = cudnn_8_3_cudatoolkit_10;
+ cudnn = cudnn_8_3_cudatoolkit_11;
cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
inherit (cutensorPackages)
@@ -4662,7 +4664,7 @@ with pkgs;
cutensor_cudatoolkit_11_3
cutensor_cudatoolkit_11_4;
- cutensor = cutensor_cudatoolkit_10;
+ cutensor = cutensor_cudatoolkit_11;
curie = callPackage ../data/fonts/curie { };
@@ -11619,6 +11621,8 @@ with pkgs;
zfsnap = callPackage ../tools/backup/zfsnap { };
+ zpool-auto-expand-partitions = callPackage ../tools/filesystems/zpool-auto-expand-partitions { };
+
zile = callPackage ../applications/editors/zile { };
zinnia = callPackage ../tools/inputmethods/zinnia { };
@@ -12716,13 +12720,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
- go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({
- inherit (darwin.apple_sdk.frameworks) Security Foundation;
- } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
- stdenv = gcc8Stdenv;
- buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
- });
-
go = go_1_17;
go-repo-root = callPackage ../development/tools/go-repo-root { };
@@ -23050,7 +23047,9 @@ with pkgs;
golint = callPackage ../development/tools/golint { };
- golangci-lint = callPackage ../development/tools/golangci-lint { };
+ golangci-lint = callPackage ../development/tools/golangci-lint {
+ buildGoModule = buildGo118Module;
+ };
gocyclo = callPackage ../development/tools/gocyclo { };
@@ -26405,7 +26404,10 @@ with pkgs;
gpsprune = callPackage ../applications/misc/gpsprune { };
- gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
+ gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder {
+ # rm me as soon as this package gains the support for cuda 11
+ cudatoolkit = cudatoolkit_10;
+ };
gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };
@@ -33764,7 +33766,7 @@ with pkgs;
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { };
- nix-doc = callPackage ../tools/package-management/nix-doc { nix = nixVersions.nix_2_5; };
+ nix-doc = callPackage ../tools/package-management/nix-doc { };
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index db0b456d905d..f259b7cc7f68 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -66,6 +66,7 @@ mapAliases ({
google_api_python_client = google-api-python-client; # added 2021-03-19
googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
+ ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
HAP-python = hap-python; # added 2021-06-01
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b908f6888290..1cab3948c617 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3205,6 +3205,10 @@ in {
garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { };
+ gattlib = callPackage ../development/python-modules/gattlib {
+ inherit (pkgs) bluez glib pkg-config;
+ };
+
gbinder-python = callPackage ../development/python-modules/gbinder-python { };
gcovr = callPackage ../development/python-modules/gcovr { };
@@ -3701,8 +3705,6 @@ in {
hdate = callPackage ../development/python-modules/hdate { };
- ha-av = callPackage ../development/python-modules/ha-av { };
-
ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { };
ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ };
@@ -4333,6 +4335,8 @@ in {
jsonmerge = callPackage ../development/python-modules/jsonmerge { };
+ json-home-client = callPackage ../development/python-modules/json-home-client { };
+
json-merge-patch = callPackage ../development/python-modules/json-merge-patch { };
json-schema-for-humans = callPackage ../development/python-modules/json-schema-for-humans { };
@@ -4883,6 +4887,8 @@ in {
losant-rest = callPackage ../development/python-modules/losant-rest { };
+ lru-dict = callPackage ../development/python-modules/lru-dict { };
+
lsassy = callPackage ../development/python-modules/lsassy { };
luddite = callPackage ../development/python-modules/luddite { };
@@ -6761,7 +6767,9 @@ in {
pyblock = callPackage ../development/python-modules/pyblock { };
- pybluez = callPackage ../development/python-modules/pybluez { };
+ pybluez = callPackage ../development/python-modules/pybluez {
+ inherit (pkgs) bluez;
+ };
pybotvac = callPackage ../development/python-modules/pybotvac { };
@@ -8377,24 +8385,6 @@ in {
pytorch = callPackage ../development/python-modules/pytorch {
cudaSupport = pkgs.config.cudaSupport or false;
-
- # TODO: next time pytorch is updated (to 1.11.0, currently in staging as of
- # 2022-03-31), make the following changes:
-
- # -> cudatoolk_11
- cudatoolkit = pkgs.cudatoolkit_10;
-
- # -> cudnn_8_3_cudatoolkit_11
- cudnn = pkgs.cudnn_8_1_cudatoolkit_10;
-
- # -> cutensor_cudatoolkit_11 (cutensor is a new dependency in v1.11.0)
- # cutensor = pkgs.cutensor_cudatoolkit_11;
-
- # -> setting a custom magma should be unnecessary with v1.11.0
- magma = pkgs.magma.override { cudatoolkit = pkgs.cudatoolkit_10; };
-
- # -> nccl_cudatoolkit_11
- nccl = pkgs.nccl.override { cudatoolkit = pkgs.cudatoolkit_10; };
};
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };
@@ -8833,6 +8823,8 @@ in {
restview = callPackage ../development/python-modules/restview { };
+ result = callPackage ../development/python-modules/result { };
+
rethinkdb = callPackage ../development/python-modules/rethinkdb { };
retry = callPackage ../development/python-modules/retry { };
@@ -10471,6 +10463,8 @@ in {
uritemplate = callPackage ../development/python-modules/uritemplate { };
+ uri-template = callPackage ../development/python-modules/uri-template { };
+
uritools = callPackage ../development/python-modules/uritools { };
url-normalize = callPackage ../development/python-modules/url-normalize { };
@@ -10761,6 +10755,8 @@ in {
widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
+ widlparser = callPackage ../development/python-modules/widlparser { };
+
wiffi = callPackage ../development/python-modules/wiffi { };
willow = callPackage ../development/python-modules/willow { };