Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1925039a74
@ -321,6 +321,14 @@
|
||||
<link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/DanielOgorchock/joycond">joycond</link>,
|
||||
a service that uses <literal>hid-nintendo</literal> to provide
|
||||
nintendo joycond pairing and better nintendo switch pro
|
||||
controller support.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-incompatibilities">
|
||||
|
||||
@ -99,6 +99,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable).
|
||||
|
||||
- [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support.
|
||||
|
||||
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
||||
|
||||
- The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.
|
||||
|
||||
@ -412,6 +412,7 @@
|
||||
./services/hardware/illum.nix
|
||||
./services/hardware/interception-tools.nix
|
||||
./services/hardware/irqbalance.nix
|
||||
./services/hardware/joycond.nix
|
||||
./services/hardware/lcd.nix
|
||||
./services/hardware/lirc.nix
|
||||
./services/hardware/nvidia-optimus.nix
|
||||
@ -543,6 +544,7 @@
|
||||
./services/misc/matrix-appservice-discord.nix
|
||||
./services/misc/matrix-appservice-irc.nix
|
||||
./services/misc/matrix-synapse.nix
|
||||
./services/misc/mautrix-facebook.nix
|
||||
./services/misc/mautrix-telegram.nix
|
||||
./services/misc/mbpfan.nix
|
||||
./services/misc/mediatomb.nix
|
||||
|
||||
40
nixos/modules/services/hardware/joycond.nix
Normal file
40
nixos/modules/services/hardware/joycond.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.joycond;
|
||||
kernelPackages = config.boot.kernelPackages;
|
||||
in
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.services.joycond = {
|
||||
enable = mkEnableOption "support for Nintendo Pro Controllers and Joycons";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.joycond;
|
||||
defaultText = "pkgs.joycond";
|
||||
description = ''
|
||||
The joycond package to use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
kernelPackages.hid-nintendo
|
||||
cfg.package
|
||||
];
|
||||
|
||||
boot.extraModulePackages = [ kernelPackages.hid-nintendo ];
|
||||
boot.kernelModules = [ "hid_nintendo" ];
|
||||
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
# Workaround for https://github.com/NixOS/nixpkgs/issues/81138
|
||||
systemd.services.joycond.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}
|
||||
195
nixos/modules/services/misc/mautrix-facebook.nix
Normal file
195
nixos/modules/services/misc/mautrix-facebook.nix
Normal file
@ -0,0 +1,195 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.mautrix-facebook;
|
||||
settingsFormat = pkgs.formats.json {};
|
||||
settingsFile = settingsFormat.generate "mautrix-facebook-config.json" cfg.settings;
|
||||
|
||||
puppetRegex = concatStringsSep
|
||||
".*"
|
||||
(map
|
||||
escapeRegex
|
||||
(splitString
|
||||
"{userid}"
|
||||
cfg.settings.bridge.username_template));
|
||||
in {
|
||||
options = {
|
||||
services.mautrix-facebook = {
|
||||
enable = mkEnableOption "Mautrix-Facebook, a Matrix-Facebook hybrid puppeting/relaybot bridge";
|
||||
|
||||
settings = mkOption rec {
|
||||
apply = recursiveUpdate default;
|
||||
type = settingsFormat.type;
|
||||
default = {
|
||||
homeserver = {
|
||||
address = "http://localhost:8008";
|
||||
};
|
||||
|
||||
appservice = rec {
|
||||
address = "http://${hostname}:${toString port}";
|
||||
hostname = "localhost";
|
||||
port = 29319;
|
||||
|
||||
database = "postgresql://";
|
||||
|
||||
bot_username = "facebookbot";
|
||||
};
|
||||
|
||||
metrics.enabled = false;
|
||||
manhole.enabled = false;
|
||||
|
||||
bridge = {
|
||||
encryption = {
|
||||
allow = true;
|
||||
default = true;
|
||||
};
|
||||
username_template = "facebook_{userid}";
|
||||
};
|
||||
|
||||
logging = {
|
||||
version = 1;
|
||||
formatters.journal_fmt.format = "%(name)s: %(message)s";
|
||||
handlers.journal = {
|
||||
class = "systemd.journal.JournalHandler";
|
||||
formatter = "journal_fmt";
|
||||
SYSLOG_IDENTIFIER = "mautrix-facebook";
|
||||
};
|
||||
root = {
|
||||
level = "INFO";
|
||||
handlers = ["journal"];
|
||||
};
|
||||
};
|
||||
};
|
||||
example = literalExpression ''
|
||||
{
|
||||
homeserver = {
|
||||
address = "http://localhost:8008";
|
||||
domain = "mydomain.example";
|
||||
};
|
||||
|
||||
bridge.permissions = {
|
||||
"@admin:mydomain.example" = "admin";
|
||||
"mydomain.example" = "user";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
<filename>config.yaml</filename> configuration as a Nix attribute set.
|
||||
Configuration options should match those described in
|
||||
<link xlink:href="https://github.com/mautrix/facebook/blob/master/mautrix_facebook/example-config.yaml">
|
||||
example-config.yaml</link>.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Secret tokens should be specified using <option>environmentFile</option>
|
||||
instead of this world-readable attribute set.
|
||||
'';
|
||||
};
|
||||
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
File containing environment variables to be passed to the mautrix-telegram service.
|
||||
|
||||
Any config variable can be overridden by setting <literal>MAUTRIX_FACEBOOK_SOME_KEY</literal> to override the <literal>some.key</literal> variable.
|
||||
'';
|
||||
};
|
||||
|
||||
configurePostgresql = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Enable PostgreSQL and create a user and database for mautrix-facebook. The default <literal>settings</literal> reference this database, if you disable this option you must provide a database URL.
|
||||
'';
|
||||
};
|
||||
|
||||
registrationData = mkOption {
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
description = ''
|
||||
Output data for appservice registration. Simply make any desired changes and serialize to JSON. Note that this data contains secrets so think twice before putting it into the nix store.
|
||||
|
||||
Currently <literal>as_token</literal> and <literal>hs_token</literal> need to be added as they are not known to this module.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.mautrix-facebook = {
|
||||
group = "mautrix-facebook";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
services.postgresql = mkIf cfg.configurePostgresql {
|
||||
ensureDatabases = ["mautrix-facebook"];
|
||||
ensureUsers = [{
|
||||
name = "mautrix-facebook";
|
||||
ensurePermissions = {
|
||||
"DATABASE \"mautrix-facebook\"" = "ALL PRIVILEGES";
|
||||
};
|
||||
}];
|
||||
};
|
||||
|
||||
systemd.services.mautrix-facebook = rec {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [
|
||||
"network-online.target"
|
||||
] ++ optional config.services.matrix-synapse.enable "matrix-synapse.service"
|
||||
++ optional cfg.configurePostgresql "postgresql.service";
|
||||
after = wants;
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
|
||||
User = "mautrix-facebook";
|
||||
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectControlGroups = true;
|
||||
PrivateTmp = true;
|
||||
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
|
||||
ExecStart = ''
|
||||
${pkgs.mautrix-facebook}/bin/mautrix-facebook --config=${settingsFile}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.mautrix-facebook = {
|
||||
registrationData = {
|
||||
id = "mautrix-facebook";
|
||||
|
||||
namespaces = {
|
||||
users = [
|
||||
{
|
||||
exclusive = true;
|
||||
regex = escapeRegex "@${cfg.settings.appservice.bot_username}:${cfg.settings.homeserver.domain}";
|
||||
}
|
||||
{
|
||||
exclusive = true;
|
||||
regex = "@${puppetRegex}:${escapeRegex cfg.settings.homeserver.domain}";
|
||||
}
|
||||
];
|
||||
aliases = [];
|
||||
};
|
||||
|
||||
url = cfg.settings.appservice.address;
|
||||
sender_localpart = "mautrix-facebook-sender";
|
||||
|
||||
rate_limited = false;
|
||||
"de.sorunome.msc2409.push_ephemeral" = true;
|
||||
push_ephemeral = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ kevincox ];
|
||||
}
|
||||
@ -185,6 +185,28 @@ let
|
||||
serviceConfig.DynamicUser = mkDefault enableDynamicUser;
|
||||
serviceConfig.User = mkDefault conf.user;
|
||||
serviceConfig.Group = conf.group;
|
||||
# Hardening
|
||||
serviceConfig.CapabilityBoundingSet = mkDefault [ "" ];
|
||||
serviceConfig.DeviceAllow = [ "" ];
|
||||
serviceConfig.LockPersonality = true;
|
||||
serviceConfig.MemoryDenyWriteExecute = true;
|
||||
serviceConfig.NoNewPrivileges = true;
|
||||
serviceConfig.PrivateDevices = true;
|
||||
serviceConfig.ProtectClock = true;
|
||||
serviceConfig.ProtectControlGroups = true;
|
||||
serviceConfig.ProtectHome = true;
|
||||
serviceConfig.ProtectHostname = true;
|
||||
serviceConfig.ProtectKernelLogs = true;
|
||||
serviceConfig.ProtectKernelModules = true;
|
||||
serviceConfig.ProtectKernelTunables = true;
|
||||
serviceConfig.ProtectSystem = mkDefault "strict";
|
||||
serviceConfig.RemoveIPC = true;
|
||||
serviceConfig.RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
serviceConfig.RestrictNamespaces = true;
|
||||
serviceConfig.RestrictRealtime = true;
|
||||
serviceConfig.RestrictSUIDSGID = true;
|
||||
serviceConfig.SystemCallArchitectures = "native";
|
||||
serviceConfig.UMask = "0077";
|
||||
} serviceOpts ]);
|
||||
};
|
||||
in
|
||||
|
||||
@ -41,6 +41,10 @@ in
|
||||
-format.new=${if cfg.newMetricFormat then "true" else "false"} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -83,6 +83,10 @@ in
|
||||
--dovecot.scopes ${concatStringsSep "," cfg.scopes} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,6 +34,10 @@ in {
|
||||
${concatStringsSep " \\n" cfg.controlSocketPaths}
|
||||
'';
|
||||
SupplementaryGroups = [ "kea" ];
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,6 +45,10 @@ in {
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
SupplementaryGroups = [ "knot" ];
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,6 +28,10 @@ in
|
||||
-rate ${cfg.refreshRate} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -79,6 +79,10 @@ in
|
||||
--web.telemetry-path ${cfg.telemetryPath} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,6 +45,7 @@ in
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
AmbientCapabilities = [ "CAP_NET_RAW" ];
|
||||
CapabilityBoundingSet = [ "CAP_NET_RAW" ];
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-smokeping-prober}/bin/smokeping_prober \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
|
||||
@ -99,6 +99,10 @@ in
|
||||
-config.file ${configFile} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,6 +13,10 @@ in {
|
||||
${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -49,6 +49,10 @@ in
|
||||
${optionalString (cfg.controlInterface != null) "--control-interface ${cfg.controlInterface}"} \
|
||||
${toString cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_UNIX to collect data
|
||||
"AF_UNIX"
|
||||
];
|
||||
};
|
||||
}] ++ [
|
||||
(mkIf config.services.unbound.enable {
|
||||
|
||||
@ -52,6 +52,7 @@ in {
|
||||
|
||||
serviceConfig = {
|
||||
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
|
||||
-p ${toString cfg.port} \
|
||||
@ -61,6 +62,10 @@ in {
|
||||
${optionalString cfg.withRemoteIp "-r"} \
|
||||
${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
# Need AF_NETLINK to collect data
|
||||
"AF_NETLINK"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -780,7 +780,7 @@ in
|
||||
in
|
||||
[
|
||||
"-net nic,netdev=user.0,model=virtio"
|
||||
"-netdev user,id=user.0,${forwardingOptions}\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
|
||||
"-netdev user,id=user.0,${forwardingOptions}\"$QEMU_NET_OPTS\""
|
||||
];
|
||||
|
||||
# FIXME: Consolidate this one day.
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-bSqGgRXqHGjT+OYCEafsT/btVe+n91+L0kB8fnrywss=";
|
||||
sha256 = "0lm7s9jy7z4an3xxj3gnxxf2xx045i157qaxysbdhcq5lwlmznc7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
||||
|
||||
@ -135,7 +135,7 @@ mkDerivation rec {
|
||||
{ description = "Set of integrated tools for the R language";
|
||||
homepage = "https://www.rstudio.com/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ changlinli ciil ];
|
||||
maintainers = with maintainers; [ ciil ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(curl -Ls https://www.bluejeans.com/download | \
|
||||
pup 'a[aria-label~="Linux"] attr{href}' | \
|
||||
#output contains *.deb and *.rpm
|
||||
grep "\.rpm" | \
|
||||
version="$(curl -Ls https://www.bluejeans.com/downloads | \
|
||||
pup 'a[href$=".rpm"] attr{href}' | \
|
||||
# output contains app and events
|
||||
grep "desktop-app" | \
|
||||
awk -F'[ ._ ]' '{printf $6"."$7"."$8"."$9"\n"}')"
|
||||
|
||||
update-source-version bluejeans-gui "$version"
|
||||
|
||||
@ -12,19 +12,20 @@ let
|
||||
owner = "dzaima";
|
||||
repo = "CBQN";
|
||||
rev = "4d23479cdbd5ac6eb512c376ade58077b814b2b7";
|
||||
sha256 = "1il6pxbllf4rs0wf2s6q6h72m3p1d6ymgsllpkmadnw1agif0fri";
|
||||
hash = "sha256-MTvg4lOB26bqvJTqV71p4Y4qDjTYaOE40Jk4Sle/hsY=";
|
||||
};
|
||||
in
|
||||
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
|
||||
version = "0.0.0+unstable=2021-10-05";
|
||||
version = "0.pre+unstable=2021-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "CBQN";
|
||||
rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
|
||||
sha256 = "17h8fb9a0hjindbxgkljajl1hjr8rdqrb85s5lz903v17wl4lrba";
|
||||
hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@ -62,8 +63,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ];
|
||||
platforms = platforms.all;
|
||||
priority = if genBytecode then 0 else 10;
|
||||
};
|
||||
}
|
||||
# TODO: factor and version cbqn-bytecode-files
|
||||
# TODO: version cbqn-bytecode-files
|
||||
# TODO: test suite
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
|
||||
version = "0.0.0+unstable=2021-10-05";
|
||||
version = "0.pre+unstable=2021-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bqn";
|
||||
version = "0.0.0+unstable=2021-10-01";
|
||||
version = "0.pre+unstable=2021-10-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlochbaum";
|
||||
repo = "BQN";
|
||||
rev = "b3d68f730d48ccb5e3b3255f9010c95bf9f86e22";
|
||||
hash = "sha256-Tkgwz7+d25svmjRsXFUQq0S/73QJU+BKSNeGqpUcBTQ=";
|
||||
rev = "2ce2dc40702431ef3d3ffece9e2f6f8b883ac6c5";
|
||||
hash = "sha256-bvXKOaBlddG6O0GbmtqU9prklqmOOvlbXuCUaFO+j0M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
buildInputs = [ nodejs ];
|
||||
|
||||
patches = [
|
||||
# Creates a @libbqn@ substitution variable
|
||||
# Creates a @libbqn@ substitution variable, to be filled in the fixupPhase
|
||||
./001-libbqn-path.patch
|
||||
];
|
||||
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodiscover";
|
||||
version = "1.4.2";
|
||||
version = "1.4.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xiIN/YLIOdPuqenyxybu0iUpYEy3MyBssXswza5InU0=";
|
||||
sha256 = "sha256-DobTx6oUr25J8bolo84V4yTT0b0jBsOIzPn93uAmDl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16lfav83g12vzs3ssfva7chcqqb7xdx54djwfwyn9xcwfaa7cwhw";
|
||||
sha256 = "sha256-XBinbhYUB9BuQxxmWfZUw276uNam4DgBpiCAjT7KDlg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "2.6.1";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0101bw2n6vd3c0p323qqr61wwraja48xbrwcw5sn7i5sa3ygfx0k";
|
||||
sha256 = "sha256-zpwkDKPrE5TFZQO0A1ifTQ7n+TRFpXi3jai3h5plyGM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "0.6.4";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QRCqkaKhPQQjNt9mw8nlTB5YKLmIZbXfrxarb3Ksr5k=";
|
||||
sha256 = "sha256-STJ9BDVbvlIMvKMiGwkGZ9Z32NvlE+3cyYduYlwTbx4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
39
pkgs/development/python-modules/airthings/default.nix
Normal file
39
pkgs/development/python-modules/airthings/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings";
|
||||
version = "0.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyAirthings";
|
||||
rev = version;
|
||||
sha256 = "08cbysx5p9k8hzr6sdykx91j0gx8x15b8807338dsl3qx8nhfb8j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "airthings" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for Airthings";
|
||||
homepage = "https://github.com/Danielhiversen/pyAirthings";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = version;
|
||||
sha256 = "sha256-lsGpCd4XgwP91JmRpV6ohXefd1Hm9C51Jk4shU6Irkw=";
|
||||
sha256 = "sha256-j1vS6PDvvuJapECn0lKGuBkYwWsyzJaTZDRQPjMsuLk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,23 +8,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ciso8601";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "closeio";
|
||||
repo = "ciso8601";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g1aiyc1ayh0rnibyy416m5mmck38ksgdm3jsy0z3rxgmgb24951";
|
||||
sha256 = "sha256-TqB1tQDgCkXu+QuzP6yBEH/xHxhhD/kGR2S0I8Osc5E=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytz
|
||||
] ++ lib.optional (isPy27) unittest2;
|
||||
] ++ lib.optional (isPy27) [
|
||||
unittest2
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ciso8601" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast ISO8601 date time parser for Python written in C";
|
||||
homepage = "https://github.com/closeio/ciso8601";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, isPy27
|
||||
, future
|
||||
, pythonOlder
|
||||
, h5py
|
||||
, ipython
|
||||
, numba
|
||||
@ -15,25 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clifford";
|
||||
version = "1.3.1";
|
||||
disabled = isPy27;
|
||||
version = "1.4.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c";
|
||||
sha256 = "sha256-eVE8FrD0YHoRreY9CrNb8v4v4KrG83ZU0oFz+V+p+Q0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Compatibility with h5py 3.
|
||||
# Will be included in the next releasse after 1.3.1
|
||||
url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
|
||||
sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
h5py
|
||||
numba
|
||||
numpy
|
||||
@ -55,15 +44,24 @@ buildPythonPackage rec {
|
||||
"veryslow"
|
||||
"test_algebra_initialisation"
|
||||
"test_cga"
|
||||
"test_estimate_rotor_sequential[random_sphere]"
|
||||
"test_grade_projection"
|
||||
"test_multiple_grade_projection"
|
||||
"test_inverse"
|
||||
"test_inv_g4"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Disable failing tests
|
||||
"test_g3c_tools.py"
|
||||
"test_multivector_inverse.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "clifford" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Numerical Geometric Algebra Module";
|
||||
homepage = "https://clifford.readthedocs.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
# many TypeError's in tests
|
||||
broken = true;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, dask
|
||||
, distributed
|
||||
, docrep
|
||||
, pytest
|
||||
, fetchPypi
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -16,19 +17,33 @@ buildPythonPackage rec {
|
||||
sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ dask distributed docrep ];
|
||||
propagatedBuildInputs = [
|
||||
dask
|
||||
distributed
|
||||
docrep
|
||||
];
|
||||
|
||||
# do not run entire tests suite (requires slurm, sge, etc.)
|
||||
checkPhase = ''
|
||||
py.test dask_jobqueue/tests/test_jobqueue_core.py
|
||||
'';
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# Do not run entire tests suite (requires slurm, sge, etc.)
|
||||
"dask_jobqueue/tests/test_jobqueue_core.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_import_scheduler_options_from_config"
|
||||
"test_security"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dask_jobqueue" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dask/dask-jobqueue";
|
||||
description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
broken = true;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2021.09.0";
|
||||
version = "2021.09.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Gb6eQ5Hebx3mBNGvgB5yvM4dPsIxJl9ka++yYC/Zf7Q=";
|
||||
sha256 = "sha256-+UkbXbWV5R/QtVb5rWm/5SA+IoWsIfBciL3vg138jkc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
31
pkgs/development/python-modules/demjson3/default.nix
Normal file
31
pkgs/development/python-modules/demjson3/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "demjson3";
|
||||
version = "3.0.5";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "103dc4pzwg8791q3zll1vv4gcc17d9v3jvr9zj23cpv9hpfsp6mb";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test/test_demjson3.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "demjson3" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
|
||||
homepage = "https://github.com/nielstron/demjson3/";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "2021.9.0";
|
||||
version = "2021.9.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# get full repository need conftest.py to run tests
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IiKc0rJYODCtGC9AAOkjbww/VG7PdfrqJ32IHU9xWbo=";
|
||||
sha256 = "sha256-9N65ap2+9bBK0DCrkF3+1xuJPXmjaL1Xh7ISaLTtX/g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fsspec";
|
||||
version = "2021.08.1";
|
||||
version = "2021.10.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intake";
|
||||
repo = "filesystem_spec";
|
||||
rev = version;
|
||||
sha256 = "0xxzcp69div1sy975x82k754snbsksyqr73h6jiasdxj8wka49s0";
|
||||
sha256 = "sha256-zvOSenK63jFC9vMLsuZT8P9NCXGdkYAB5AxvptROKes=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcsfs";
|
||||
version = "2021.08.1";
|
||||
version = "2021.10.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SPQcSdEEbU791oqkvuwmvyvQ6HglvoWKMi5SdnRcEZI=";
|
||||
sha256 = "sha256-GDVIENtNpo8cg7pplOgoDMVguZmxoUUSs860WNfhmfM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, protobuf
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gtfs-realtime-bindings";
|
||||
version = "0.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vav7ah6gpkpi44rk202bwpl345rydg6n9zibzx5p7gcsblcwd45";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
protobuf
|
||||
];
|
||||
|
||||
# Tests are not shipped, only a tarball for Java is present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "google.transit" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings generated from the GTFS Realtime protocol buffer spec";
|
||||
homepage = "https://github.com/andystewart999/TransportNSW";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hass-nabucasa";
|
||||
version = "0.46.0";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nabucasa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "109ma1qlhifj5hs530zfnvc6mqv5grfmcq3s57wawq9nzq0gpfy8";
|
||||
sha256 = "sha256-0E8eiHzqbxHbtAd97MbvFMRDWTu25E9x/44oNGC4mUM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.18.55";
|
||||
version = "1.18.56";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "45519e811bbd284fc7d69e932abcaa9c551071db4fb6e69502736b81dcc72a7d";
|
||||
sha256 = "61c74253cb77a0734970703d58a49e29624cec76d97da31fa912faf6f6d3347b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,19 +2,24 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netdisco";
|
||||
version = "2.9.0";
|
||||
version = "3.0.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OpLFM+0ZmhggJ1SuLoSO+qWLcKcpS65sd7u2zkzPys4=";
|
||||
sha256 = "sha256-TbtZBILzd8zEYeAXQnB8y+jx0tGyhXivkdybf+vNy9I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests zeroconf ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Broken due to removed discoverables in https://github.com/home-assistant-libs/netdisco/commit/477db5a1dc93919a6c5bd61b4b1d3c80e75785bd
|
||||
"tests/test_xboxone.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"netdisco"
|
||||
"netdisco.discovery"
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pubnub";
|
||||
version = "5.3.1";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fykqr0agdlrhsy2s4yzadyslyjlhgr9iyj2f7s8hz9j400dhj3h";
|
||||
sha256 = "sha256-FyDsTqDQTI/Xxu4Sl4eHqwmgwN+ip+8WKGJs/h/kl2Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,35 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, oauthlib
|
||||
, requests
|
||||
, requests_oauthlib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, oauthlib
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests_oauthlib
|
||||
, requests-mock
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "5.2.3";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "6.1.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w9rhh85z9m3c4rbz6zxlrxglsm5sk5d6796dsj1p1l3b3ad476z";
|
||||
sha256 = "sha256-Iscnv3hfYa8QFiXMUN334Muo0oGqnnK11RPNxQJggG0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "oauthlib~=3.1" "oauthlib" \
|
||||
--replace "requests~=2.24" "requests"
|
||||
'';
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
@ -46,12 +48,18 @@ buildPythonPackage rec {
|
||||
requests-mock
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "oauthlib~=3.1" "oauthlib" \
|
||||
--replace "requests~=2.24" "requests"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pyatmo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple API to access Netatmo weather station data";
|
||||
homepage = "https://github.com/jabesq/pyatmo";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/jabesq/netatmo-api-python";
|
||||
maintainers = with maintainers; [ delroth ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycarwings2";
|
||||
version = "2.11";
|
||||
version = "2.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@ -19,8 +19,9 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "filcole";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0daqxnic7kphspqqq8a0bjp009l5a7d1k72q6cz43g7ca6wfq4b1";
|
||||
# release not tagged: https://github.com/filcole/pycarwings2/issues/33
|
||||
rev = "0dc9e7e74cb119614c72c7f955801a366f303c56";
|
||||
sha256 = "sha256-3lyAgLuaNrCDvRT2yYkgaDiLPKW9Hbg05cQlMIBUs6o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "83";
|
||||
version = "84";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "v${version}";
|
||||
sha256 = "0azpdgmfby8plsp22hy1ip9vzbnmvf9brmah7hcwkpypg31rb61y";
|
||||
sha256 = "sha256-SVWz6r5UiAS7gCpkgN2Swy8dAon26XY9JZucV/eE0t8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypoint";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fredrike";
|
||||
repo = "pypoint";
|
||||
rev = "v${version}";
|
||||
sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x";
|
||||
sha256 = "sha256-2PKZtn+l93de4/gPPM2Wdt04Zw+ekDadwNgL6ZKTqhY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, demjson
|
||||
, demjson3
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysyncthru";
|
||||
version = "0.7.8";
|
||||
version = "0.7.10";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
@ -17,12 +17,12 @@ buildPythonPackage rec {
|
||||
owner = "nielstron";
|
||||
repo = "pysyncthru";
|
||||
rev = "release-${version}";
|
||||
sha256 = "17k9dhnya4304gqmkyvvf94jvikmnkf2lqairl3rfrl7w68jm3vp";
|
||||
sha256 = "1c29w2ldrnq0vxr9cfa2pjhwdvrpw393c84khgg2y56jrkbidq53";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
demjson
|
||||
demjson3
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-smarttub";
|
||||
version = "0.0.25";
|
||||
version = "0.0.27";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13yf75vmn15g2hrbiv78mws96qbk40p5pz7vc6ljyp41y2lc9wpm";
|
||||
sha256 = "sha256-EoZn5yxj18hi4oEMuUcB5UN2xQFkLbSG/awp+Qh029E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -43,6 +43,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/mdz/python-smarttub";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
broken = pyjwt.version != "1.7.1";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-tado";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||
owner = "wmalgadey";
|
||||
repo = "PyTado";
|
||||
rev = version;
|
||||
sha256 = "0fw4f9gqnhxwpxyb34qi8bl5pmzz13h4x3mdk903hhjyccanqncr";
|
||||
sha256 = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
36
pkgs/development/python-modules/pytransportnsw/default.nix
Normal file
36
pkgs/development/python-modules/pytransportnsw/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytransportnsw";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTransportNSW";
|
||||
inherit version;
|
||||
sha256 = "00jklgjirmc58hiaqqc2n2rgixvx91bgrd6lv6hv28k51kid10f3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "TransportNSW" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to access Transport NSW information";
|
||||
homepage = "https://github.com/Dav0815/TransportNSW";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
38
pkgs/development/python-modules/pytransportnswv2/default.nix
Normal file
38
pkgs/development/python-modules/pytransportnswv2/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, gtfs-realtime-bindings
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytransportnswv2";
|
||||
version = "0.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTransportNSWv2";
|
||||
inherit version;
|
||||
sha256 = "129rrqckqgfrwdx0b83dqphcv55cxs5i8jl1ascia7rpzjn109ah";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gtfs-realtime-bindings
|
||||
requests
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "TransportNSW" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to access Transport NSW information";
|
||||
homepage = "https://github.com/andystewart999/TransportNSW";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.8.1";
|
||||
version = "2.9.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = version;
|
||||
sha256 = "sha256-SmbsEN6vZ28ihgUggtcF2AjbmUVaqLLweh7cKipr6u4=";
|
||||
sha256 = "sha256-Uzz2mWBT5BaMxYeR6YFIP1BqTWye1Hz9CTTg/bg4kSU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3fs";
|
||||
version = "2021.8.1";
|
||||
version = "2021.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zwy2fr95s5wzrr2iwbayjh9xh421p6wf0m75szl7rw930v1kb2y";
|
||||
sha256 = "sha256-mSdMmP5b6pu954GQxBrb0bEghyLLKtSGd6aPhHPwOV0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,22 +1,20 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlabswater";
|
||||
version = "0.3.2";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "stream-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lh1i1ksic9yhxnwc7mqm5qla98x85dfwj846kwldwam0vcrqlk7";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kXG0Wg3PVryMBQ9RMMtEzudMiwVQq7Ikw2OK7JcBojA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "surepy";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "benleb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h2PEzS3R7NXIUWYOiTpe5ZEU1RopaRj1phudmvcklug=";
|
||||
sha256 = "sha256-yc+jXA4ndFhRZmFPz11HbVs9qaPFNa6WdwXj6hRyjw4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "6.56.0";
|
||||
version = "7.1.0";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-vVJuuPxVyOqnplPYrjCjIm5IyIFZvsCMoDLrrHpHK+4=";
|
||||
sha256 = "sha256-pagqetDQ8/1xDCxZJVTZc9T0dmFA1opd7tMDR11wlVs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.61";
|
||||
version = "0.0.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = version;
|
||||
sha256 = "sha256-uDQAXH0p8Ly0ZbwNlkVo1b7fAXSu77U7v3BHd0B1YQk=";
|
||||
sha256 = "sha256-wXXdxE69EABrvJA8utrhLW4+8ixcyCraWHx2M3uE8mw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.37.1";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = version;
|
||||
sha256 = "sha256-tDpu6tv8qwIPB3G5GKURtDi6QOYxF5jEVbzmJ2Px5W4=";
|
||||
sha256 = "sha256-3iS2VMaicbgtsiKUPe6GjFJQV8xKjs+dC8+IeprMa9I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.30.0";
|
||||
version = "0.31.3";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-KYMq0qDVLHzgaYljwYeK58aggD5kBAI1J/RsirGcVvs=";
|
||||
sha256 = "sha256-mOcaxt8pc+d7qBoDtwCsDWoVs3Hw17v5WDKgzIW1WzY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -135,13 +135,13 @@ rec {
|
||||
headers = "0p8lkhy97yq43sl6s4rskhdnzl520968cyh5l4fdhl2fhm5mayd4";
|
||||
};
|
||||
|
||||
electron_15 = mkElectron "15.1.0" {
|
||||
armv7l-linux = "30213989477e29341b9873110e4b180e7d2ced4f72d26c914e7642930c9338fb";
|
||||
aarch64-linux = "7a6f07727b91e150b16e9cac5e374ce88c43c85aae76b306a0e5b2a37b3275e8";
|
||||
x86_64-linux = "c2f50ede410558e2eb761648fc9bacf34472dccf8b740f3037d351f9ae604072";
|
||||
i686-linux = "0b502ca518f61c0613d2dee1c1ae18d0d71c793f9b822f6c92b6428afda20f20";
|
||||
x86_64-darwin = "8062bbb29e5f12bf1efee27dc5dd18c98ef9b09d68c8fabd12ad4465e5bb02bd";
|
||||
aarch64-darwin = "cb28d4a1167ea2f42668ff4b880223ccf211a79ea53024652afc90b7aaac419e";
|
||||
headers = "128rw8z06izymwic2lrqbjx7p1ap39q3mmawswwpr6h0jazqrkv3";
|
||||
electron_15 = mkElectron "15.1.1" {
|
||||
armv7l-linux = "902711052fdb0e7bfcded9396aa24fd5bcf6fcc5f70548f51396d75a45cd6645";
|
||||
aarch64-linux = "05b24c409a6dbf83b5f64f2d8904fa37cf71259c46beaaabd4b9a5ba75d03cd3";
|
||||
x86_64-linux = "70de2da51c6a8591b88f08366c82166a51b1719243f67ef1a14eddbb806a115f";
|
||||
i686-linux = "30f4be4dcf06c6dda953af94dd14a232767592f69e7f408def1a5b58dab054ea";
|
||||
x86_64-darwin = "ddfab707063a79f25a95983abeba6ef4e581d53b6f26e7667fde4fd11c5547b0";
|
||||
aarch64-darwin = "8db2ff70446e081311bb1d5cc8a13fd66e7143046747f87cdb07b139d973bb89";
|
||||
headers = "1hfgxk1iyzg6jr36s78l3m3g8433gna6l1n2jz33mz9iw66wgy27";
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "skopeo";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "containers";
|
||||
repo = "skopeo";
|
||||
sha256 = "sha256-K+Zn+L7yylUj+iMrsXocWRD4O8HmxdsIsjO36SCkWiU=";
|
||||
sha256 = "sha256-75zrOYiwlpHbEgmpJ9THYKbF4sL4Jp009/+Fw12Wvys=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
|
||||
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
|
||||
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
|
||||
++ lib.optionals openglSupport [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
|
||||
++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
|
||||
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
|
||||
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
|
||||
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevdev, udev }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevdev, udev, acl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "joycond";
|
||||
version = "unstable-2021-03-27";
|
||||
version = "unstable-2021-07-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielOgorchock";
|
||||
repo = "joycond";
|
||||
rev = "2d3f553060291f1bfee2e49fc2ca4a768b289df8";
|
||||
sha256 = "0dpmwspll9ar3pxg9rgnh224934par8h8bixdz9i2pqqbc3dqib7";
|
||||
rev = "f9a66914622514c13997c2bf7ec20fa98e9dfc1d";
|
||||
sha256 = "sha256-quw7yBHDDZk1+6uHthsfMCej7g5uP0nIAqzvI6436B8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
@ -25,6 +25,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
substituteInPlace $out/etc/systemd/system/joycond.service --replace \
|
||||
"ExecStart=/usr/bin/joycond" "ExecStart=$out/bin/joycond"
|
||||
|
||||
substituteInPlace $out/etc/udev/rules.d/89-joycond.rules --replace \
|
||||
"/bin/setfacl" "${acl}/bin/setfacl"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.9.7";
|
||||
version = "2021.10.0";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
@ -19,6 +19,7 @@
|
||||
"air_quality" = ps: with ps; [ ];
|
||||
"airly" = ps: with ps; [ airly ];
|
||||
"airnow" = ps: with ps; [ pyairnow ];
|
||||
"airthings" = ps: with ps; [ ]; # missing inputs: airthings_cloud
|
||||
"airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi
|
||||
"airvisual" = ps: with ps; [ pyairvisual ];
|
||||
"aladdin_connect" = ps: with ps; [ aladdin-connect ];
|
||||
@ -30,6 +31,7 @@
|
||||
"alpha_vantage" = ps: with ps; [ alpha-vantage ];
|
||||
"amazon_polly" = ps: with ps; [ boto3 ];
|
||||
"ambee" = ps: with ps; [ ambee ];
|
||||
"amberelectric" = ps: with ps; [ amberelectric ];
|
||||
"ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ];
|
||||
"ambient_station" = ps: with ps; [ aioambient ];
|
||||
"amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
|
||||
@ -43,7 +45,7 @@
|
||||
"apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
|
||||
"api" = ps: with ps; [ aiohttp-cors ];
|
||||
"apns" = ps: with ps; [ ]; # missing inputs: apns2
|
||||
"apple_tv" = ps: with ps; [ aiohttp-cors ifaddr netdisco pyatv zeroconf ];
|
||||
"apple_tv" = ps: with ps; [ pyatv ];
|
||||
"apprise" = ps: with ps; [ apprise ];
|
||||
"aprs" = ps: with ps; [ aprslib geopy ];
|
||||
"aqualogic" = ps: with ps; [ aqualogic ];
|
||||
@ -149,6 +151,7 @@
|
||||
"cover" = ps: with ps; [ ];
|
||||
"cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
|
||||
"cpuspeed" = ps: with ps; [ py-cpuinfo ];
|
||||
"crownstone" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; # missing inputs: crownstone-cloud crownstone-sse crownstone-uart
|
||||
"cups" = ps: with ps; [ pycups ];
|
||||
"currencylayer" = ps: with ps; [ ];
|
||||
"daikin" = ps: with ps; [ pydaikin ];
|
||||
@ -160,7 +163,7 @@
|
||||
"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 defusedxml emoji 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 emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ];
|
||||
"delijn" = ps: with ps; [ pydelijn ];
|
||||
"deluge" = ps: with ps; [ deluge-client ];
|
||||
"demo" = ps: with ps; [ aiohttp-cors ];
|
||||
@ -185,7 +188,7 @@
|
||||
"dlib_face_detect" = ps: with ps; [ face_recognition ];
|
||||
"dlib_face_identify" = ps: with ps; [ face_recognition ];
|
||||
"dlink" = ps: with ps; [ ]; # missing inputs: pyW215
|
||||
"dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr ];
|
||||
"dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
|
||||
"dnsip" = ps: with ps; [ aiodns ];
|
||||
"dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi
|
||||
"doods" = ps: with ps; [ pillow pydoods ];
|
||||
@ -213,7 +216,7 @@
|
||||
"edimax" = ps: with ps; [ pyedimax ];
|
||||
"edl21" = ps: with ps; [ pysml ];
|
||||
"ee_brightbox" = ps: with ps; [ eebrightbox ];
|
||||
"efergy" = ps: with ps; [ ];
|
||||
"efergy" = ps: with ps; [ ]; # missing inputs: pyefergy
|
||||
"egardia" = ps: with ps; [ pythonegardia ];
|
||||
"eight_sleep" = ps: with ps; [ pyeight ];
|
||||
"elgato" = ps: with ps; [ elgato ];
|
||||
@ -224,7 +227,7 @@
|
||||
"emoncms" = ps: with ps; [ ];
|
||||
"emoncms_history" = ps: with ps; [ ];
|
||||
"emonitor" = ps: with ps; [ aioemonitor ];
|
||||
"emulated_hue" = ps: with ps; [ aiohttp-cors ];
|
||||
"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 ];
|
||||
@ -527,7 +530,7 @@
|
||||
"mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ];
|
||||
"mochad" = ps: with ps; [ ]; # missing inputs: pymochad
|
||||
"modbus" = ps: with ps; [ pymodbus ];
|
||||
"modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem
|
||||
"modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ];
|
||||
"modern_forms" = ps: with ps; [ aiomodernforms ];
|
||||
"mold_indicator" = ps: with ps; [ ];
|
||||
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
|
||||
@ -555,7 +558,7 @@
|
||||
"nad" = ps: with ps; [ nad-receiver ];
|
||||
"nam" = ps: with ps; [ nettigo-air-monitor ];
|
||||
"namecheapdns" = ps: with ps; [ defusedxml ];
|
||||
"nanoleaf" = ps: with ps; [ pynanoleaf ];
|
||||
"nanoleaf" = ps: with ps; [ aionanoleaf ];
|
||||
"neato" = ps: with ps; [ aiohttp-cors pybotvac ];
|
||||
"nederlandse_spoorwegen" = ps: with ps; [ nsapi ];
|
||||
"nello" = ps: with ps; [ pynello ];
|
||||
@ -802,7 +805,7 @@
|
||||
"somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ];
|
||||
"sonarr" = ps: with ps; [ sonarr ];
|
||||
"songpal" = ps: with ps; [ python-songpal ];
|
||||
"sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ];
|
||||
"sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco zeroconf ];
|
||||
"sony_projector" = ps: with ps; [ pysdcp ];
|
||||
"soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
|
||||
"spaceapi" = ps: with ps; [ aiohttp-cors ];
|
||||
@ -814,7 +817,7 @@
|
||||
"sql" = ps: with ps; [ sqlalchemy ];
|
||||
"squeezebox" = ps: with ps; [ pysqueezebox ];
|
||||
"srp_energy" = ps: with ps; [ srpenergy ];
|
||||
"ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ];
|
||||
"ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
|
||||
"starline" = ps: with ps; [ starline ];
|
||||
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
|
||||
"startca" = ps: with ps; [ xmltodict ];
|
||||
@ -867,7 +870,6 @@
|
||||
"temper" = ps: with ps; [ ]; # missing inputs: temperusb
|
||||
"template" = ps: with ps; [ ];
|
||||
"tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official
|
||||
"tesla" = ps: with ps; [ teslajsonpy ];
|
||||
"tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
|
||||
"thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke
|
||||
"thethingsnetwork" = ps: with ps; [ ];
|
||||
@ -889,21 +891,20 @@
|
||||
"torque" = ps: with ps; [ aiohttp-cors ];
|
||||
"totalconnect" = ps: with ps; [ total-connect-client ];
|
||||
"touchline" = ps: with ps; [ ]; # missing inputs: pytouchline
|
||||
"tplink" = ps: with ps; [ pyhs100 ];
|
||||
"tplink" = ps: with ps; [ aiohttp-cors ifaddr python-kasa ];
|
||||
"tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
|
||||
"traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar
|
||||
"trace" = ps: with ps; [ ];
|
||||
"trackr" = ps: with ps; [ ]; # missing inputs: pytrackr
|
||||
"tractive" = ps: with ps; [ aiotractive ];
|
||||
"tradfri" = ps: with ps; [ pytradfri ];
|
||||
"trafikverket_train" = ps: with ps; [ pytrafikverket ];
|
||||
"trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ];
|
||||
"transmission" = ps: with ps; [ transmissionrpc ];
|
||||
"transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW
|
||||
"transport_nsw" = ps: with ps; [ pytransportnsw ];
|
||||
"travisci" = ps: with ps; [ ]; # missing inputs: TravisPy
|
||||
"trend" = ps: with ps; [ numpy ];
|
||||
"tts" = ps: with ps; [ aiohttp-cors mutagen ];
|
||||
"tuya" = ps: with ps; [ tuyaha ];
|
||||
"tuya" = ps: with ps; [ tuya-iot-py-sdk ];
|
||||
"twentemilieu" = ps: with ps; [ twentemilieu ];
|
||||
"twilio" = ps: with ps; [ aiohttp-cors twilio ];
|
||||
"twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
|
||||
@ -922,7 +923,7 @@
|
||||
"upc_connect" = ps: with ps; [ connect-box ];
|
||||
"upcloud" = ps: with ps; [ upcloud-api ];
|
||||
"updater" = ps: with ps; [ ];
|
||||
"upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ];
|
||||
"upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
|
||||
"uptime" = ps: with ps; [ ];
|
||||
"uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
|
||||
"usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ];
|
||||
@ -933,7 +934,7 @@
|
||||
"vacuum" = ps: with ps; [ ];
|
||||
"vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api
|
||||
"vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
|
||||
"velbus" = ps: with ps; [ python-velbus ];
|
||||
"velbus" = ps: with ps; [ velbus-aio ];
|
||||
"velux" = ps: with ps; [ pyvlx ];
|
||||
"venstar" = ps: with ps; [ venstarcolortouch ];
|
||||
"vera" = ps: with ps; [ pyvera ];
|
||||
@ -961,12 +962,14 @@
|
||||
"waterfurnace" = ps: with ps; [ waterfurnace ];
|
||||
"watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf
|
||||
"watson_tts" = ps: with ps; [ ibm-watson ];
|
||||
"watttime" = ps: with ps; [ aiowatttime ];
|
||||
"waze_travel_time" = ps: with ps; [ wazeroutecalculator ];
|
||||
"weather" = ps: with ps; [ ];
|
||||
"webhook" = ps: with ps; [ aiohttp-cors ];
|
||||
"webostv" = ps: with ps; [ aiopylgtv ];
|
||||
"websocket_api" = ps: with ps; [ aiohttp-cors ];
|
||||
"wemo" = ps: with ps; [ pywemo ];
|
||||
"whirlpool" = ps: with ps; [ whirlpool-sixth-sense ];
|
||||
"whois" = ps: with ps; [ python-whois ];
|
||||
"wiffi" = ps: with ps; [ wiffi ];
|
||||
"wilight" = ps: with ps; [ pywilight ];
|
||||
@ -993,7 +996,7 @@
|
||||
"xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client
|
||||
"yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ];
|
||||
"yamaha" = ps: with ps; [ rxv ];
|
||||
"yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client defusedxml ifaddr zeroconf ];
|
||||
"yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client ifaddr zeroconf ];
|
||||
"yandex_transport" = ps: with ps; [ aioymaps ];
|
||||
"yandextts" = ps: with ps; [ ];
|
||||
"yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight ];
|
||||
@ -1006,13 +1009,13 @@
|
||||
"zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
|
||||
"zerproc" = ps: with ps; [ pyzerproc ];
|
||||
"zestimate" = ps: with ps; [ xmltodict ];
|
||||
"zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
|
||||
"zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ];
|
||||
"zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
|
||||
"ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
|
||||
"zodiac" = ps: with ps; [ ];
|
||||
"zone" = ps: with ps; [ ];
|
||||
"zoneminder" = ps: with ps; [ zm-py ];
|
||||
"zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ];
|
||||
"zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
|
||||
"zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,19 +21,6 @@
|
||||
|
||||
let
|
||||
defaultOverrides = [
|
||||
# Pinned due to API changes in async-upnp-client>=0.20.0, remove after
|
||||
(self: super: {
|
||||
async-upnp-client = super.async-upnp-client.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.20.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
|
||||
(mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
|
||||
|
||||
@ -52,24 +39,6 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to API changes in pyjwt>=2.0
|
||||
(self: super: {
|
||||
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.7.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
|
||||
};
|
||||
disabledTests = [
|
||||
"test_ec_verify_should_return_false_if_signature_invalid"
|
||||
];
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to API changes in pylast 4.2.1
|
||||
(mkOverride "pylast" "4.2.0"
|
||||
"0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3")
|
||||
|
||||
# Pinned due to API changes in pyruckus>0.12
|
||||
(self: super: {
|
||||
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
|
||||
@ -145,7 +114,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.9.7";
|
||||
hassVersion = "2021.10.0";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -162,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1vcdnxh671iqhlbf6811j537by2i03fhryp9r9x77477y2y0xd6k";
|
||||
sha256 = "0m54ynx0i4a6wljg6d9i6xa79c15cqah5cgaswgrbaxhjw5q78iv";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
@ -337,7 +306,6 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"ecobee"
|
||||
"econet"
|
||||
"ee_brightbox"
|
||||
"efergy"
|
||||
"elgato"
|
||||
"elkm1"
|
||||
"emonitor"
|
||||
@ -681,6 +649,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"trace"
|
||||
"tradfri"
|
||||
"transmission"
|
||||
"transport_nsw"
|
||||
"trend"
|
||||
"tts"
|
||||
"tuya"
|
||||
@ -800,7 +769,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable"
|
||||
"--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable"
|
||||
# tado/test_climate.py: Tries to connect to my.tado.com
|
||||
"--deselect tests/components/tado/test_climate.py::test_air_con["
|
||||
"--deselect tests/components/tado/test_climate.py::test_air_con"
|
||||
# helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
|
||||
"--deselect tests/helpers/test_system_info.py::test_container_installationtype"
|
||||
# tests are located in tests/
|
||||
@ -813,6 +782,9 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"tests/components"
|
||||
# pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
|
||||
"tests/auth/mfa_modules/test_notify.py"
|
||||
# emulated_hue/test_upnp.py: Tries to establish the public ipv4 address
|
||||
"tests/components/emulated_hue/test_upnp.py"
|
||||
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@ -4,11 +4,11 @@ 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 = "20210830.0";
|
||||
version = "20211006.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4sNCnYFQ4IjmMPj7axgienZUMDo+GwTJ38cEf0iZzJI=";
|
||||
sha256 = "sha256-rlscTHqa1TMsIVW7kWFGR/feak0XewDRkybpo8dPXj0=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -16,6 +16,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Prometheus exporter for OpenVPN";
|
||||
broken = true;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
};
|
||||
|
||||
@ -1,434 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
new file mode 100644
|
||||
index 0000000..4bea8c1
|
||||
--- /dev/null
|
||||
+++ b/Cargo.lock
|
||||
@@ -0,0 +1,428 @@
|
||||
+# This file is automatically @generated by Cargo.
|
||||
+# It is not intended for manual editing.
|
||||
+[[package]]
|
||||
+name = "adler"
|
||||
+version = "1.0.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "autocfg"
|
||||
+version = "1.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "bitflags"
|
||||
+version = "1.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "byteorder"
|
||||
+version = "1.4.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "bzip2"
|
||||
+version = "0.4.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
|
||||
+dependencies = [
|
||||
+ "bzip2-sys",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "bzip2-sys"
|
||||
+version = "0.1.11+1.0.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
|
||||
+dependencies = [
|
||||
+ "cc",
|
||||
+ "libc",
|
||||
+ "pkg-config",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "cc"
|
||||
+version = "1.0.69"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "cfg-if"
|
||||
+version = "1.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "crc32fast"
|
||||
+version = "1.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "filetime"
|
||||
+version = "0.2.14"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "redox_syscall",
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "flate2"
|
||||
+version = "1.0.20"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "crc32fast",
|
||||
+ "libc",
|
||||
+ "miniz_oxide",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "fuchsia-cprng"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "getrandom"
|
||||
+version = "0.2.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "wasi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "libc"
|
||||
+version = "0.2.98"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "lzma-sys"
|
||||
+version = "0.1.17"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619"
|
||||
+dependencies = [
|
||||
+ "cc",
|
||||
+ "libc",
|
||||
+ "pkg-config",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "miniz_oxide"
|
||||
+version = "0.4.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
|
||||
+dependencies = [
|
||||
+ "adler",
|
||||
+ "autocfg",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ouch"
|
||||
+version = "0.1.5"
|
||||
+dependencies = [
|
||||
+ "bzip2",
|
||||
+ "flate2",
|
||||
+ "rand 0.8.4",
|
||||
+ "strsim",
|
||||
+ "tar",
|
||||
+ "tempdir",
|
||||
+ "walkdir",
|
||||
+ "xz2",
|
||||
+ "zip",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "pkg-config"
|
||||
+version = "0.3.19"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ppv-lite86"
|
||||
+version = "0.2.10"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "proc-macro2"
|
||||
+version = "1.0.28"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
|
||||
+dependencies = [
|
||||
+ "unicode-xid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "quote"
|
||||
+version = "1.0.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand"
|
||||
+version = "0.4.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
|
||||
+dependencies = [
|
||||
+ "fuchsia-cprng",
|
||||
+ "libc",
|
||||
+ "rand_core 0.3.1",
|
||||
+ "rdrand",
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand"
|
||||
+version = "0.8.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "rand_chacha",
|
||||
+ "rand_core 0.6.3",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_chacha"
|
||||
+version = "0.3.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
+dependencies = [
|
||||
+ "ppv-lite86",
|
||||
+ "rand_core 0.6.3",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_core"
|
||||
+version = "0.3.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
|
||||
+dependencies = [
|
||||
+ "rand_core 0.4.2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_core"
|
||||
+version = "0.4.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_core"
|
||||
+version = "0.6.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
|
||||
+dependencies = [
|
||||
+ "getrandom",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rdrand"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
|
||||
+dependencies = [
|
||||
+ "rand_core 0.3.1",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "redox_syscall"
|
||||
+version = "0.2.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "remove_dir_all"
|
||||
+version = "0.5.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||
+dependencies = [
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "same-file"
|
||||
+version = "1.0.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
+dependencies = [
|
||||
+ "winapi-util",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "strsim"
|
||||
+version = "0.10.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "1.0.74"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "unicode-xid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "tar"
|
||||
+version = "0.4.35"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80"
|
||||
+dependencies = [
|
||||
+ "filetime",
|
||||
+ "libc",
|
||||
+ "xattr",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "tempdir"
|
||||
+version = "0.3.7"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
|
||||
+dependencies = [
|
||||
+ "rand 0.4.6",
|
||||
+ "remove_dir_all",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thiserror"
|
||||
+version = "1.0.26"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
|
||||
+dependencies = [
|
||||
+ "thiserror-impl",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thiserror-impl"
|
||||
+version = "1.0.26"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "syn",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "time"
|
||||
+version = "0.1.43"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "unicode-xid"
|
||||
+version = "0.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "walkdir"
|
||||
+version = "2.3.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
|
||||
+dependencies = [
|
||||
+ "same-file",
|
||||
+ "winapi",
|
||||
+ "winapi-util",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasi"
|
||||
+version = "0.10.2+wasi-snapshot-preview1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi"
|
||||
+version = "0.3.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
+dependencies = [
|
||||
+ "winapi-i686-pc-windows-gnu",
|
||||
+ "winapi-x86_64-pc-windows-gnu",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-i686-pc-windows-gnu"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-util"
|
||||
+version = "0.1.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
+dependencies = [
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-x86_64-pc-windows-gnu"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "xattr"
|
||||
+version = "0.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "xz2"
|
||||
+version = "0.1.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
|
||||
+dependencies = [
|
||||
+ "lzma-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "zip"
|
||||
+version = "0.5.13"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
|
||||
+dependencies = [
|
||||
+ "byteorder",
|
||||
+ "bzip2",
|
||||
+ "crc32fast",
|
||||
+ "flate2",
|
||||
+ "thiserror",
|
||||
+ "time",
|
||||
+]
|
||||
@ -2,26 +2,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ouch";
|
||||
version = "0.1.5";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrmiguel";
|
||||
owner = "ouch-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00ah8hgrppa61jhwb74zl5b509q0yp2pp27w9frm814iqx70qn38";
|
||||
sha256 = "sha256-OhEr/HvwgDkB8h3cpayOlnrs6OXiwAsQUH9XGqi5rpc=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# a patch file to add Cargo.lock in the source code
|
||||
# https://github.com/vrmiguel/ouch/pull/46
|
||||
./add-Cargo.lock.patch
|
||||
];
|
||||
|
||||
cargoSha256 = "181aq8r78g4bl1ndlwl54ws5ccrwph0mmk9506djxvfdy3hndxkg";
|
||||
cargoSha256 = "sha256-lKsB75Lb9IYS80qu4jaIpnbEOr4Ow9M5S45Kk03An2o=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Taking the pain away from file (de)compression";
|
||||
homepage = "https://github.com/vrmiguel/ouch";
|
||||
description = "A command-line utility for easily compressing and decompressing files and directories";
|
||||
homepage = "https://github.com/ouch-org/ouch";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.psibi ];
|
||||
};
|
||||
|
||||
@ -234,13 +234,13 @@ in rec {
|
||||
nixUnstable = lib.lowPrio (callPackage common rec {
|
||||
pname = "nix";
|
||||
version = "2.4${suffix}";
|
||||
suffix = "pre20211001_${lib.substring 0 7 src.rev}";
|
||||
suffix = "pre20211006_${lib.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "4f496150eb4e0012914c11f0a3ff4df2412b1d09";
|
||||
sha256 = "00hxxk66f068588ymv60ygib6vgk7c97s9yia3qd561679rq3nsj";
|
||||
rev = "53e479428958b39a126ce15de85d7397fdcfe2e1";
|
||||
sha256 = "18mm3f0n964msj5bha6wpnwckg5lwjwdm6r7frrwdj75v10jiyb7";
|
||||
};
|
||||
|
||||
boehmgc = boehmgc_nixUnstable;
|
||||
|
||||
@ -12896,29 +12896,22 @@ with pkgs;
|
||||
|
||||
# Below, the classic self-bootstrapping process
|
||||
cbqn-bootstrap = lib.dontRecurseIntoAttrs {
|
||||
# use clang here since it emits less speculative warnings;
|
||||
# however, avoid its building in cross compilations
|
||||
stdenv =
|
||||
if stdenv.hostPlatform == stdenv.buildPlatform
|
||||
then clangStdenv
|
||||
else stdenv;
|
||||
mbqn-source = buildPackages.mbqn.src;
|
||||
|
||||
phase0 = callPackage ../development/interpreters/bqn/cbqn {
|
||||
inherit (cbqn-bootstrap) stdenv;
|
||||
genBytecode = false;
|
||||
bqn-path = null;
|
||||
mbqn-source = null;
|
||||
};
|
||||
|
||||
phase1 = callPackage ../development/interpreters/bqn/cbqn {
|
||||
inherit (cbqn-bootstrap) stdenv mbqn-source;
|
||||
inherit (cbqn-bootstrap) mbqn-source;
|
||||
genBytecode = true;
|
||||
bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn";
|
||||
};
|
||||
|
||||
phase2 = callPackage ../development/interpreters/bqn/cbqn {
|
||||
inherit (cbqn-bootstrap) stdenv mbqn-source;
|
||||
inherit (cbqn-bootstrap) mbqn-source;
|
||||
genBytecode = true;
|
||||
bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn";
|
||||
};
|
||||
@ -13625,7 +13618,8 @@ with pkgs;
|
||||
electron_11
|
||||
electron_12
|
||||
electron_13
|
||||
electron_14;
|
||||
electron_14
|
||||
electron_15;
|
||||
|
||||
autobuild = callPackage ../development/tools/misc/autobuild { };
|
||||
|
||||
@ -32617,9 +32611,11 @@ with pkgs;
|
||||
});
|
||||
|
||||
winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
|
||||
wine64Packages = recurseIntoAttrs (winePackagesFor "wine64");
|
||||
wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
|
||||
|
||||
wine = winePackages.full;
|
||||
wine64 = wine64Packages.full;
|
||||
|
||||
wine-staging = lowPrio (winePackages.full.override {
|
||||
wineRelease = "staging";
|
||||
|
||||
@ -403,6 +403,8 @@ in {
|
||||
|
||||
airly = callPackage ../development/python-modules/airly { };
|
||||
|
||||
airthings = callPackage ../development/python-modules/airthings { };
|
||||
|
||||
ajpy = callPackage ../development/python-modules/ajpy { };
|
||||
|
||||
ajsonrpc = callPackage ../development/python-modules/ajsonrpc { };
|
||||
@ -1956,6 +1958,8 @@ in {
|
||||
|
||||
demjson = callPackage ../development/python-modules/demjson { };
|
||||
|
||||
demjson3 = callPackage ../development/python-modules/demjson3 { };
|
||||
|
||||
dendropy = callPackage ../development/python-modules/dendropy { };
|
||||
|
||||
denonavr = callPackage ../development/python-modules/denonavr { };
|
||||
@ -3281,6 +3285,8 @@ in {
|
||||
gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { };
|
||||
|
||||
gtimelog = callPackage ../development/python-modules/gtimelog { };
|
||||
|
||||
gtts = callPackage ../development/python-modules/gtts { };
|
||||
@ -7575,6 +7581,10 @@ in {
|
||||
|
||||
pytrafikverket = callPackage ../development/python-modules/pytrafikverket { };
|
||||
|
||||
pytransportnsw = callPackage ../development/python-modules/pytransportnsw { };
|
||||
|
||||
pytransportnswv2 = callPackage ../development/python-modules/pytransportnswv2 { };
|
||||
|
||||
pytrends = callPackage ../development/python-modules/pytrends { };
|
||||
|
||||
pytricia = callPackage ../development/python-modules/pytricia { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user