movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-03-05 12:01:44 +00:00 • committed by GitHub
commit fade30f7b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 1246 additions and 621 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json
View file

@ -8,7 +8,7 @@
}, },
"context.modules": [ "context.modules": [
{ {
"name": "libpipewire-module-rtkit", "name": "libpipewire-module-rt",
"args": {}, "args": {},
"flags": [ "flags": [
"ifexists", "ifexists",

118
nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json Normal file
View file

@ -0,0 +1,118 @@
{
"context.properties": {
"link.max-buffers": 16,
"core.daemon": true,
"core.name": "pipewire-0",
"settings.check-quantum": true,
"settings.check-rate": true,
"vm.overrides": {
"default.clock.min-quantum": 1024
}
},
"context.spa-libs": {
"audio.convert.*": "audioconvert/libspa-audioconvert",
"api.alsa.*": "alsa/libspa-alsa",
"support.*": "support/libspa-support"
},
"context.modules": [
{
"name": "libpipewire-module-rt",
"args": {
"nice.level": -11
},
"flags": [
"ifexists",
"nofail"
]
},
{
"name": "libpipewire-module-protocol-native"
},
{
"name": "libpipewire-module-profiler"
},
{
"name": "libpipewire-module-metadata"
},
{
"name": "libpipewire-module-spa-node-factory"
},
{
"name": "libpipewire-module-client-node"
},
{
"name": "libpipewire-module-access",
"args": {}
},
{
"name": "libpipewire-module-adapter"
},
{
"name": "libpipewire-module-link-factory"
}
],
"context.objects": [
{
"factory": "metadata",
"args": {
"metadata.name": "default"
}
},
{
"factory": "spa-node-factory",
"args": {
"factory.name": "support.node.driver",
"node.name": "Dummy-Driver",
"node.group": "pipewire.dummy",
"priority.driver": 20000
}
},
{
"factory": "spa-node-factory",
"args": {
"factory.name": "support.node.driver",
"node.name": "Freewheel-Driver",
"priority.driver": 19000,
"node.group": "pipewire.freewheel",
"node.freewheel": true
}
},
{
"factory": "adapter",
"args": {
"factory.name": "api.alsa.pcm.source",
"node.name": "system",
"node.description": "system",
"media.class": "Audio/Source",
"api.alsa.path": "hw:0",
"node.suspend-on-idle": true,
"resample.disable": true,
"channelmix.disable": true,
"adapter.auto-port-config": {
"mode": "dsp",
"monitor": false,
"position": "unknown"
}
}
},
{
"factory": "adapter",
"args": {
"factory.name": "api.alsa.pcm.sink",
"node.name": "system",
"node.description": "system",
"media.class": "Audio/Sink",
"api.alsa.path": "hw:0",
"node.suspend-on-idle": true,
"resample.disable": true,
"channelmix.disable": true,
"adapter.auto-port-config": {
"mode": "dsp",
"monitor": false,
"position": "unknown"
}
}
}
],
"context.exec": []
}

65
nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json
View file

@ -6,8 +6,10 @@
}, },
"context.modules": [ "context.modules": [
{ {
"name": "libpipewire-module-rtkit", "name": "libpipewire-module-rt",
"args": {}, "args": {
"nice.level": -11
},
"flags": [ "flags": [
"ifexists", "ifexists",
"nofail" "nofail"
@ -37,6 +39,61 @@
} }
} }
], ],
"context.exec": [], "context.exec": [
"stream.properties": {} {
"path": "pactl",
"args": "load-module module-always-sink"
}
],
"stream.properties": {},
"pulse.rules": [
{
"matches": [
{}
],
"actions": {
"update-props": {}
}
},
{
"matches": [
{
"application.process.binary": "teams"
},
{
"application.process.binary": "skypeforlinux"
}
],
"actions": {
"quirks": [
"force-s16-info"
]
}
},
{
"matches": [
{
"application.process.binary": "firefox"
}
],
"actions": {
"quirks": [
"remove-capture-dont-move"
]
}
},
{
"matches": [
{
"application.name": "~speech-dispatcher*"
}
],
"actions": {
"update-props": {
"pulse.min.req": "1024/48000",
"pulse.min.quantum": "1024/48000"
}
}
}
]
} }

7
nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json
View file

@ -3,6 +3,7 @@
"link.max-buffers": 16, "link.max-buffers": 16,
"core.daemon": true, "core.daemon": true,
"core.name": "pipewire-0", "core.name": "pipewire-0",
"default.clock.min-quantum": 16,
"vm.overrides": { "vm.overrides": {
"default.clock.min-quantum": 1024 "default.clock.min-quantum": 1024
} }
@ -19,8 +20,10 @@
}, },
"context.modules": [ "context.modules": [
{ {
"name": "libpipewire-module-rtkit", "name": "libpipewire-module-rt",
"args": {}, "args": {
"nice.level": -11
},
"flags": [ "flags": [
"ifexists", "ifexists",
"nofail" "nofail"

5
nixos/modules/services/desktops/pipewire/pipewire.nix
View file

@ -25,15 +25,18 @@ let
client = lib.importJSON ./daemon/client.conf.json; client = lib.importJSON ./daemon/client.conf.json;
client-rt = lib.importJSON ./daemon/client-rt.conf.json; client-rt = lib.importJSON ./daemon/client-rt.conf.json;
jack = lib.importJSON ./daemon/jack.conf.json; jack = lib.importJSON ./daemon/jack.conf.json;
minimal = lib.importJSON ./daemon/minimal.conf.json;
pipewire = lib.importJSON ./daemon/pipewire.conf.json; pipewire = lib.importJSON ./daemon/pipewire.conf.json;
pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json;
}; };
useSessionManager = cfg.wireplumber.enable || cfg.media-session.enable;
configs = { configs = {
client = recursiveUpdate defaults.client cfg.config.client; client = recursiveUpdate defaults.client cfg.config.client;
client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt; client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt;
jack = recursiveUpdate defaults.jack cfg.config.jack; jack = recursiveUpdate defaults.jack cfg.config.jack;
pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire; pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire;
pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse;
}; };
in { in {

43
nixos/tests/home-assistant.nix
View file

@ -2,8 +2,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
let let
configDir = "/var/lib/foobar"; configDir = "/var/lib/foobar";
mqttUsername = "homeassistant";
mqttPassword = "secret";
in { in {
name = "home-assistant"; name = "home-assistant";
meta.maintainers = lib.teams.home-assistant.members; meta.maintainers = lib.teams.home-assistant.members;
@ -11,18 +9,6 @@ in {
nodes.hass = { pkgs, ... }: { nodes.hass = { pkgs, ... }: {
environment.systemPackages = with pkgs; [ mosquitto ]; environment.systemPackages = with pkgs; [ mosquitto ];
services.mosquitto = {
enable = true;
listeners = [ {
users = {
"${mqttUsername}" = {
acl = [ "readwrite #" ];
password = mqttPassword;
};
};
} ];
};
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "hass" ]; ensureDatabases = [ "hass" ];
@ -76,23 +62,6 @@ in {
# https://www.home-assistant.io/integrations/frontend/ # https://www.home-assistant.io/integrations/frontend/
frontend = {}; frontend = {};
# configure an mqtt broker connection
# https://www.home-assistant.io/integrations/mqtt
mqtt = {
broker = "127.0.0.1";
username = mqttUsername;
password = mqttPassword;
};
# create a mqtt sensor that syncs state with its mqtt topic
# https://www.home-assistant.io/integrations/sensor.mqtt/
binary_sensor = [ {
platform = "mqtt";
state_topic = "home-assistant/test";
payload_on = "let_there_be_light";
payload_off = "off";
} ];
# set up a wake-on-lan switch to test capset capability required # set up a wake-on-lan switch to test capset capability required
# for the ping suid wrapper # for the ping suid wrapper
# https://www.home-assistant.io/integrations/wake_on_lan/ # https://www.home-assistant.io/integrations/wake_on_lan/
@ -109,11 +78,9 @@ in {
listen_port = 80; listen_port = 80;
}; };
# show mqtt interaction in the log
# https://www.home-assistant.io/integrations/logger/ # https://www.home-assistant.io/integrations/logger/
logger = { logger = {
default = "info"; default = "info";
logs."homeassistant.components.mqtt" = "debug";
}; };
}; };
@ -167,12 +134,6 @@ in {
hass.wait_for_open_port(8123) hass.wait_for_open_port(8123)
hass.succeed("curl --fail http://localhost:8123/lovelace") hass.succeed("curl --fail http://localhost:8123/lovelace")
with subtest("Toggle a binary sensor using MQTT"):
hass.wait_for_open_port(1883)
hass.succeed(
"mosquitto_pub -V mqttv5 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light"
)
with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"): with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"):
hass.wait_for_open_port(80) hass.wait_for_open_port(80)
hass.succeed("curl --fail http://localhost:80/description.xml") hass.succeed("curl --fail http://localhost:80/description.xml")
@ -188,10 +149,6 @@ in {
with subtest("Check that no errors were logged"): with subtest("Check that no errors were logged"):
assert "ERROR" not in output_log assert "ERROR" not in output_log
# example line: 2020-06-20 10:01:32 DEBUG (MainThread) [homeassistant.components.mqtt] Received message on home-assistant/test: b'let_there_be_light'
with subtest("Check we received the mosquitto message"):
assert "let_there_be_light" in output_log
with subtest("Check systemd unit hardening"): with subtest("Check systemd unit hardening"):
hass.log(hass.succeed("systemctl cat home-assistant.service")) hass.log(hass.succeed("systemctl cat home-assistant.service"))
hass.log(hass.succeed("systemd-analyze security home-assistant.service")) hass.log(hass.succeed("systemd-analyze security home-assistant.service"))

36
pkgs/applications/graphics/skanpage/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib
, mkDerivation
, fetchurl
, extra-cmake-modules
, kirigami2
, ktextwidgets
, libksane
, qtquickcontrols2
}:
mkDerivation rec {
pname = "skanpage";
version = "1.0.0";
src = fetchurl {
url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz";
hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA=";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kirigami2
ktextwidgets
libksane
qtquickcontrols2
];
meta = with lib; {
description = "KDE utility to scan images and multi-page documents";
homepage = "https://apps.kde.org/skanpage";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ samuelgrf ];
platforms = platforms.linux;
};
}

6
pkgs/applications/misc/genact/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "genact"; pname = "genact";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "svenstaro"; owner = "svenstaro";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c"; sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI=";
}; };
cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc"; cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ=";
meta = with lib; { meta = with lib; {
description = "A nonsense activity generator"; description = "A nonsense activity generator";

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -91,11 +91,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.35.103"; version = "1.36.109";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; sha256 = "KKoMpMagq5lVoRFyWNs92LdPwNIlmAjfwqxfOArIFeo=";
}; };
dontConfigure = true; dontConfigure = true;

2
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -1,6 +1,6 @@
{ {
"stable": { "stable": {
"version": "99.0.4844.52", "version": "99.0.4844.51",
"sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp", "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
"sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1", "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1",
"deps": { "deps": {

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
version = "97.0.1"; version = "97.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"; sha512 = "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c";
}; };
meta = { meta = {
@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec { firefox-esr-91 = common rec {
pname = "firefox-esr"; pname = "firefox-esr";
version = "91.6.0esr"; version = "91.6.1esr";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; sha512 = "e72ff7114e251ec3558f47bb45e4017fe4c665a95e0a108d5818c628b3de44c92f57cfb3dd9f5a25b7abad889be228f89dda838bc20fc9617c90655694184ed5";
}; };
meta = { meta = {

10
pkgs/applications/networking/instant-messengers/schildichat/pin.json
View file

@ -1,7 +1,9 @@
{ {
"version": "1.10.3-sc.0.test.1", "version": "1.10.4-sc.1",
"rev": "3a8eecb023c832acc4390d3a51c0940eafb2b3bd", "rev": "v1.10.4-sc.1",
"srcHash": "07amc69ghfz39jbps14ysfql4m42dmzbdjq9hqvzirhqz52mshf3", "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl",
"webYarnHash": "0knkl8sanqcx0lxjclz6s8vm5wpn8aywx9vydz7lda3l6c2g5zqf", "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw",
"jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di",
"reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f",
"desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn"
} }

34
pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
View file

@ -25,10 +25,18 @@ in stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
offlineCache = fetchYarnDeps { webOfflineCache = fetchYarnDeps {
yarnLock = src + "/element-web/yarn.lock"; yarnLock = src + "/element-web/yarn.lock";
sha256 = pinData.webYarnHash; sha256 = pinData.webYarnHash;
}; };
jsSdkOfflineCache = fetchYarnDeps {
yarnLock = src + "/matrix-js-sdk/yarn.lock";
sha256 = pinData.jsSdkYarnHash;
};
reactSdkOfflineCache = fetchYarnDeps {
yarnLock = src + "/matrix-react-sdk/yarn.lock";
sha256 = pinData.reactSdkYarnHash;
};
nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ];
@ -37,14 +45,30 @@ in stdenv.mkDerivation rec {
export HOME=$PWD/tmp export HOME=$PWD/tmp
mkdir -p $HOME mkdir -p $HOME
pushd element-web pushd element-web
yarn config --offline set yarn-offline-mirror $offlineCache
fixup_yarn_lock yarn.lock fixup_yarn_lock yarn.lock
yarn config --offline set yarn-offline-mirror $webOfflineCache
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules
rm -rf node_modules/matrix-react-sdk rm -rf node_modules/matrix-react-sdk
patchShebangs node_modules/ ../matrix-react-sdk/scripts/
ln -s $PWD/../matrix-react-sdk node_modules/ ln -s $PWD/../matrix-react-sdk node_modules/
ln -s $PWD/node_modules ../matrix-react-sdk/ rm -rf node_modules/matrix-js-sdk
ln -s $PWD/../matrix-js-sdk node_modules/
popd
pushd matrix-js-sdk
fixup_yarn_lock yarn.lock
yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules
popd
pushd matrix-react-sdk
fixup_yarn_lock yarn.lock
yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules scripts
popd popd
runHook postConfigure runHook postConfigure
@ -54,7 +78,7 @@ in stdenv.mkDerivation rec {
runHook preBuild runHook preBuild
pushd matrix-react-sdk pushd matrix-react-sdk
node_modules/.bin/reskindex -h ../element-web/src/header ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header
popd popd
pushd element-web pushd element-web

4
pkgs/applications/networking/instant-messengers/schildichat/update.sh
View file

@ -27,6 +27,8 @@ src_hash=$(echo $src_data | jq -r .sha256)
web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock)
desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock)
js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock)
react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock)
cat > pin.json << EOF cat > pin.json << EOF
{ {
@ -34,6 +36,8 @@ cat > pin.json << EOF
"rev": "$rev", "rev": "$rev",
"srcHash": "$src_hash", "srcHash": "$src_hash",
"webYarnHash": "$web_yarn_hash", "webYarnHash": "$web_yarn_hash",
"jsSdkYarnHash": "$js_sdk_yarn_hash",
"reactSdkYarnHash": "$react_sdk_yarn_hash",
"desktopYarnHash": "$desktop_yarn_hash" "desktopYarnHash": "$desktop_yarn_hash"
} }
EOF EOF

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20220301"; version = "20220303";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-1Z6jl4trAzKrI9WO3MpCJtg0R3Riyd5wvunErCkkiig="; sha256 = "sha256-3fT9cHosg/A/JowIARQ46OxmsQWFOBb7tIiRWVNfUo4=";
}; };
# Remove when Apple SDK is >= 10.13 # Remove when Apple SDK is >= 10.13

11
pkgs/applications/networking/termius/default.nix
View file

@ -8,19 +8,22 @@
, lib , lib
, udev , udev
, wrapGAppsHook , wrapGAppsHook
, libxshmfence
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "termius"; pname = "termius";
version = "7.17.1"; version = "7.34.1";
src = fetchurl { src = fetchurl {
# find the latest version with # find the latest version with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version' # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version'
# and the url with # and the url with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap"; # and the sha512 with
sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg="; # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_101.snap";
sha512 = "7fdd82535fd288277b01fedde4739dc97782236fbf25372efa56114bba676c21277ed96b32a1d46ac86af19925b14935818af50985d43a1307639530db044af4";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -40,7 +43,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ];
buildInputs = atomEnv.packages; buildInputs = atomEnv.packages ++ [ libxshmfence ];
unpackPhase = '' unpackPhase = ''
runHook preUnpack runHook preUnpack

56
pkgs/applications/office/paperless-ng/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, fetchurl , fetchurl
, fetchpatch
, nixosTests , nixosTests
, python3 , python3
, ghostscript , ghostscript
@ -50,6 +51,15 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw=";
}; };
patches = [
# Fix the `slow_write_pdf` test:
# https://github.com/NixOS/nixpkgs/issues/136626
(fetchpatch {
url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch";
sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I=";
})
];
format = "other"; format = "other";
# Make bind address configurable # Make bind address configurable
@ -151,27 +161,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
zope_interface zope_interface
]; ];
doCheck = true;
checkInputs = with py.pkgs.pythonPackages; [
pytest
pytest-cov
pytest-django
pytest-env
pytest-sugar
pytest-xdist
factory_boy
];
# The tests require:
# - PATH with runtime binaries
# - A temporary HOME directory for gnupg
# - XDG_DATA_DIRS with test-specific fonts
checkPhase = ''
pushd src
PATH="${path}:$PATH" HOME=$(mktemp -d) XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" pytest
popd
'';
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
cp -r . $out/lib/paperless-ng cp -r . $out/lib/paperless-ng
@ -181,6 +170,31 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
--prefix PATH : "${path}" --prefix PATH : "${path}"
''; '';
checkInputs = with py.pkgs.pythonPackages; [
pytest-django
pytest-env
pytest-sugar
pytest-xdist
factory_boy
pytestCheckHook
];
pytestFlagsArray = [ "src" ];
# The tests require:
# - PATH with runtime binaries
# - A temporary HOME directory for gnupg
# - XDG_DATA_DIRS with test-specific fonts
preCheck = ''
export PATH="${path}:$PATH"
export HOME=$(mktemp -d)
export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS"
# Disable unneeded code coverage test
substituteInPlace src/setup.cfg \
--replace "--cov --cov-report=html" ""
'';
passthru = { passthru = {
# PYTHONPATH of all dependencies used by the package # PYTHONPATH of all dependencies used by the package
pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;

38
pkgs/applications/virtualization/distrobox/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenvNoCC, lib, fetchFromGitHub }:
stdenvNoCC.mkDerivation rec {
pname = "distrobox";
version = "1.2.13";
src = fetchFromGitHub {
owner = "89luca89";
repo = pname;
rev = version;
sha256 = "047mrhsfi88mgwylnnyxg6xa7hjjrajn2pf7vfmb6161myqybvfy";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
./install -p $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Wrapper around podman or docker to create and start containers";
longDescription = ''
Use any linux distribution inside your terminal. Enable both backward and
forward compatibility with software and freedom to use whatever distribution
you’re more comfortable with
'';
homepage = "https://distrobox.privatedns.org/";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ atila ];
};
}

2
pkgs/applications/virtualization/looking-glass-client/default.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
wayland-protocols wayland-protocols
]; ];
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ];
postUnpack = '' postUnpack = ''
echo ${src.rev} > source/VERSION echo ${src.rev} > source/VERSION

14
pkgs/development/libraries/pipewire/0070-installed-tests-path.patch
View file

@ -1,23 +1,23 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index d4a4cda7..a27569bd 100644 index 2107c19ec..20ccdfd9f 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' @@ -380,8 +380,8 @@ lilv_lib = dependency('lilv-0', required: get_option('lv2'))
summary({'lilv (for lv2 plugins)': lilv_lib.found()}, bool_yn: true)
alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) cdata.set('HAVE_LILV', lilv_lib.found())
-installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name -installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name
-installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name -installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name
+installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name
+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name
installed_tests_enabled = not get_option('installed_tests').disabled() installed_tests_enabled = get_option('installed_tests').allowed()
installed_tests_template = files('template.test.in') installed_tests_template = files('template.test.in')
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index 1b915ac3..85beb86a 100644 index 961ae2a76..a36e9e45f 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -29,6 +29,9 @@ option('installed_tests', @@ -22,6 +22,9 @@ option('installed_tests',
description: 'Install manual and automated test executables', description: 'Install manual and automated test executables',
type: 'feature', type: 'feature',
value: 'disabled') value: 'disabled')

7
pkgs/development/libraries/pipewire/default.nix
View file

@ -68,7 +68,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.45"; version = "0.3.48";
outputs = [ outputs = [
"out" "out"
@ -86,7 +86,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-OnQd98qfOekAsVXLbciZLNPrM84KBX6fOx/f8y2BYI0="; sha256 = "sha256-+gk/MJ9YimHBwN2I42DRP+I2OqBFFtZ81Fd/l89HcSk=";
}; };
patches = [ patches = [
@ -137,7 +137,7 @@ let
++ lib.optional zeroconfSupport avahi ++ lib.optional zeroconfSupport avahi
++ lib.optional raopSupport openssl ++ lib.optional raopSupport openssl
++ lib.optional rocSupport roc-toolkit ++ lib.optional rocSupport roc-toolkit
++ lib.optionals x11Support [ libcanberra xorg.libX11 ]; ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ];
# Valgrind binary is required for running one optional test. # Valgrind binary is required for running one optional test.
checkInputs = lib.optional withValgrind valgrind; checkInputs = lib.optional withValgrind valgrind;
@ -213,6 +213,7 @@ let
"nix-support/client-rt.conf.json" "nix-support/client-rt.conf.json"
"nix-support/client.conf.json" "nix-support/client.conf.json"
"nix-support/jack.conf.json" "nix-support/jack.conf.json"
"nix-support/minimal.conf.json"
"nix-support/pipewire.conf.json" "nix-support/pipewire.conf.json"
"nix-support/pipewire-pulse.conf.json" "nix-support/pipewire-pulse.conf.json"
]; ];

4
pkgs/development/python-modules/aiodiscover/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiodiscover"; pname = "aiodiscover";
version = "1.4.7"; version = "1.4.8";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bdraco"; owner = "bdraco";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NtiShZpPFl+elYNPLaKAg6uV8pDJv0pyR+NTUiFoMm0="; sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/aiohomekit/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohomekit"; pname = "aiohomekit";
version = "0.6.11"; version = "0.7.15";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Jc2k"; owner = "Jc2k";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1rrdzzb2gcl3lc8l5vb99hy2lmdj5723fds2q78n4sf83y93czw7"; sha256 = "sha256-na94H1ll9aZz/mQ4/y3b2vhSaOgo4OjtIsAfW6zGYyI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,6 +34,8 @@ buildPythonPackage rec {
zeroconf zeroconf
]; ];
doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0";
checkInputs = [ checkInputs = [
pytest-aiohttp pytest-aiohttp
pytestCheckHook pytestCheckHook

4
pkgs/development/python-modules/aiohue/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohue"; pname = "aiohue";
version = "4.2.1"; version = "4.3.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-bcSCYNJt9xYBMmuZYM6s+PWV0TAUFOn3ibHE0KRX+iw="; hash = "sha256-PslmDeG/o9WAOc0FhidUNaISrlXa3rba3UEuvPVN/+A=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

5
pkgs/development/python-modules/aiopvpc/default.nix
View file

@ -46,6 +46,11 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [
# Failures seem related to changes in holidays-0.13, https://github.com/azogue/aiopvpc/issues/44
"test_number_of_national_holidays"
];
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml --replace \ substituteInPlace pyproject.toml --replace \
" --cov --cov-report term --cov-report html" "" " --cov --cov-report term --cov-report html" ""

4
pkgs/development/python-modules/aioshelly/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioshelly"; pname = "aioshelly";
version = "1.0.10"; version = "1.0.11";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-YHdHh7uC9QF+dj+SI2Y4rEkBq+gGalNBmuWFVgq7XOM="; hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/asn1/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "asn1"; pname = "asn1";
version = "2.4.2"; version = "2.5.0";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "andrivet"; owner = "andrivet";
repo = "python-asn1"; repo = "python-asn1";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fx/kWOnh5Gk1DjeX0xiCJYnd5teD18RvKyOnawcfWWA="; sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

33
pkgs/development/python-modules/asyncsleepiq/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
}:
buildPythonPackage rec {
pname = "asyncsleepiq";
version = "1.1.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "93c944ff84fd23832b188320b10681a3b1caf935dd584cdd4e508a9bcc8fec1b";
};
propagatedBuildInputs = [
aiohttp
];
# upstream has no tests
doCheck = false;
pythonImportsCheck = [ "asyncsleepiq" ];
meta = with lib; {
description = "Async interface to SleepIQ API";
homepage = "https://github.com/kbickar/asyncsleepiq";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

13
pkgs/development/python-modules/elkm1-lib/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elkm1-lib"; pname = "elkm1-lib";
version = "1.0.0"; version = "1.2.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gwww"; owner = "gwww";
repo = "elkm1"; repo = "elkm1";
rev = version; rev = version;
sha256 = "04xidix6l5d9rqfwp6cmj6wvais04nlvz5ynp0zwgyjp9sh2nhp6"; hash = "sha256-+rFW7qFpay/ebUz9EEB8nn0kuqVtVmG5ZHOWG2bMPts=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,15 +36,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
patches = [
# Switch to poetry-core, https://github.com/gwww/elkm1/pull/45
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/gwww/elkm1/commit/807a17268498298908bf82af4933b158b37c8f32.patch";
sha256 = "1539g8wsxppqj6dm6w81ps05frb8vrfaxahxn2cqs76zdhvly3p9";
})
];
pythonImportsCheck = [ "elkm1_lib" ]; pythonImportsCheck = [ "elkm1_lib" ];
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/fastapi/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastapi"; pname = "fastapi";
version = "0.74.1"; version = "0.75.0";
format = "flit"; format = "flit";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "tiangolo"; owner = "tiangolo";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-aYSJ30nAS3cG1fVSXuX2m3bxUSnpbWWUxFQy7dzuiTA="; sha256 = "sha256-LCdScvQUdwOM8Don/5n/49bKrivT+bkhqWcBNku4fso=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

38
pkgs/development/python-modules/ffmpeg-python/default.nix
View file

@ -1,25 +1,38 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, substituteAll
, pytestCheckHook
, ffmpeg , ffmpeg
, future , future
, pytest-runner
, pytest-mock , pytest-mock
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, substituteAll
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ffmpeg-python"; pname = "ffmpeg-python";
version = "0.2.0"; version = "0.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kkroening"; owner = "kkroening";
repo = "ffmpeg-python"; repo = "ffmpeg-python";
rev = version; rev = version;
sha256 = "0mmydmfz3yiclbgi4lqrv9fh2nalafg4bkm92y2qi50mwqgffk8f"; hash = "sha256-Dk3nHuYVlIiFF6nORZ5TVFkBXdoZUxLfoiz68V1tvlY=";
}; };
propagatedBuildInputs = [
future
];
checkInputs = [
pytestCheckHook
pytest-mock
];
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./ffmpeg-location.patch; src = ./ffmpeg-location.patch;
@ -27,14 +40,23 @@ buildPythonPackage rec {
}) })
]; ];
buildInputs = [ pytest-runner ]; postPatch = ''
propagatedBuildInputs = [ future ]; substituteInPlace setup.py \
checkInputs = [ pytestCheckHook pytest-mock ]; --replace "'pytest-runner'" ""
'';
pythonImportsCheck = [
"ffmpeg"
];
disabledTests = lib.optionals (pythonAtLeast "3.10") [
"test__output__video_size"
];
meta = with lib; { meta = with lib; {
description = "Python bindings for FFmpeg - with complex filtering support"; description = "Python bindings for FFmpeg - with complex filtering support";
homepage = "https://github.com/kkroening/ffmpeg-python"; homepage = "https://github.com/kkroening/ffmpeg-python";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.AluisioASG ]; maintainers = with maintainers; [ AluisioASG ];
}; };
} }

57
pkgs/development/python-modules/gridnet/default.nix Normal file
View file

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, poetry-core
, aiohttp
, yarl
, aresponses
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "gridnet";
version = "4.0.0";
disabled = pythonOlder "3.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "klaasnicolaas";
repo = "python-gridnet";
rev = "v${version}";
hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}" \
--replace "--cov" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
yarl
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "gridnet" ];
meta = with lib; {
description = "Asynchronous Python client for NET2GRID devices";
homepage = "https://github.com/klaasnicolaas/python-gridnet";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

6
pkgs/development/python-modules/hass-nabucasa/default.nix
View file

@ -15,13 +15,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hass-nabucasa"; pname = "hass-nabucasa";
version = "0.52.0"; version = "0.54.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nabucasa"; owner = "nabucasa";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-mTbNuER26BPQIjcmlpkdFNeBcNF1vTldaNpoEla0XbM="; sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE=";
}; };
postPatch = '' postPatch = ''
@ -41,6 +41,8 @@ buildPythonPackage rec {
warrant warrant
]; ];
doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0";
checkInputs = [ checkInputs = [
asynctest asynctest
pytest-aiohttp pytest-aiohttp

4
pkgs/development/python-modules/holidays/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "holidays"; pname = "holidays";
version = "0.12"; version = "0.13";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46"; sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/mypy-boto3-builder/default.nix
View file

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mypy-boto3-builder"; pname = "mypy-boto3-builder";
version = "7.2.1"; version = "7.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "vemel"; owner = "vemel";
repo = "mypy_boto3_builder"; repo = "mypy_boto3_builder";
rev = version; rev = version;
hash = "sha256-jovvSNw2ahCwhA+9zOrn9bR2siXJetZPymQVG4EC9Us="; hash = "sha256-X/dPO2p6GmnyJwcVPOmyo9zYda2uYfBAkuKTeX0Bt0Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/python-modules/poolsense/default.nix
View file

@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; hash = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE=";
}; };
propagatedBuildInputs = [ aiohttp ]; propagatedBuildInputs = [ aiohttp ];

4
pkgs/development/python-modules/pydeconz/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydeconz"; pname = "pydeconz";
version = "86"; version = "87";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Kane610"; owner = "Kane610";
repo = "deconz"; repo = "deconz";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NqNXbF5rGMCbugzZY+AQPPHYmQx/RrSwqtnoF1shSSU="; sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

18
pkgs/development/python-modules/pyefergy/default.nix
View file

@ -1,15 +1,18 @@
{ lib { lib
, aiohttp , aiohttp
, aresponses
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, iso4217 , iso4217
, pytest-asyncio
, pytestCheckHook
, pythonOlder , pythonOlder
, pytz , pytz
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyefergy"; pname = "pyefergy";
version = "0.1.5"; version = "22.1.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,7 +21,7 @@ buildPythonPackage rec {
owner = "tkdrob"; owner = "tkdrob";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-8xcKgsZ6buaQdrKD8Qn7jB5IlQ0NkR0nZGuFk+Dd8Q8="; sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -27,10 +30,15 @@ buildPythonPackage rec {
pytz pytz
]; ];
# Project has no tests checkInputs = [
doCheck = false; aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "pyefergy" ]; pythonImportsCheck = [
"pyefergy"
];
meta = with lib; { meta = with lib; {
description = "Python API library for Efergy energy meters"; description = "Python API library for Efergy energy meters";

4
pkgs/development/python-modules/pynina/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pynina"; pname = "pynina";
version = "0.1.4"; version = "0.1.7";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "PyNINA"; pname = "PyNINA";
inherit version; inherit version;
sha256 = "1q382b70ydzzbqb9sa5y5w7039rp6q0wyffarrsdw916kbc4zyqd"; sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pyrogram/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyrogram"; pname = "pyrogram";
version = "1.4.7"; version = "1.4.8";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
pname = "Pyrogram"; pname = "Pyrogram";
inherit version; inherit version;
hash = "sha256-2kBlTaP2tkUgP4TiP+9zv5pgCap9VnyB8BEHI6SY+uc="; hash = "sha256-mUJEV8DLYhXNvYiuiVDCfgMmZRDCNZuydngj9C9FvQU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

11
pkgs/development/python-modules/python-benedict/default.nix
View file

@ -2,16 +2,15 @@
, aiohttp , aiohttp
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook , ftfy
, pythonOlder
, mailchecker , mailchecker
, phonenumbers , phonenumbers
, pytestCheckHook
, python-dateutil , python-dateutil
, python-fsutil , python-fsutil
, pythonOlder
, python-slugify , python-slugify
, pyyaml , pyyaml
, ftfy
, requests , requests
, six , six
, toml , toml
@ -20,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-benedict"; pname = "python-benedict";
version = "0.24.3"; version = "0.25.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -29,7 +28,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo"; owner = "fabiocaccamo";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0="; hash = "sha256-G7pTbxNcESMUiKpQxjiF0gwN5mBhmuwIDlzauN5JCB4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

14
pkgs/development/python-modules/python-slugify/default.nix
View file

@ -9,12 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-slugify"; pname = "python-slugify";
version = "5.0.2"; version = "6.1.0";
format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -26,9 +28,13 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pytestFlagsArray = [ "test.py" ]; pytestFlagsArray = [
"test.py"
];
pythonImportsCheck = [ "slugify" ]; pythonImportsCheck = [
"slugify"
];
meta = with lib; { meta = with lib; {
description = "Python Slugify application that handles Unicode"; description = "Python Slugify application that handles Unicode";

32
pkgs/development/python-modules/python-trovo/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "python-trovo";
version = "0.1.5";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JUJax9nk4NqpMMrbDmQhcy22GIqPha+K4tudQ98PvlE=";
};
propagatedBuildInputs = [ requests ];
# No tests found
doCheck = false;
pythonImportsCheck = [ "trovoApi" ];
meta = with lib; {
description = "A Python wrapper for the Trovo API";
homepage = "https://codeberg.org/wolfangaukang/python-trovo";
license = licenses.gpl3Only;
maintainers = with maintainers; [ wolfangaukang ];
};
}

67
pkgs/development/python-modules/radios/default.nix Normal file
View file

@ -0,0 +1,67 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, poetry-core
, aiodns
, aiohttp
, awesomeversion
, backoff
, cachetools
, pycountry
, pydantic
, yarl
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "radios";
version = "0.1.0";
disabled = pythonOlder "3.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "frenck";
repo = "python-radios";
rev = "v${version}";
hash = "sha256-3xRtOGY9DYnZN0g95213vWDbO3/XZZ5+s7A9sqNmO/w=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}" \
--replace "--cov" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiodns
aiohttp
awesomeversion
backoff
cachetools
pycountry
pydantic
yarl
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "radios" ];
meta = with lib; {
description = "Asynchronous Python client for the Radio Browser API";
homepage = "https://github.com/frenck/python-radios";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/reolink/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "reolink"; pname = "reolink";
version = "0053"; version = "0.60";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fwestenberg"; owner = "fwestenberg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0qjp7n2qa9n9fdhfcgfgw89hy19z5144cxhkhmhv1xnfdiz175qd"; sha256 = "sha256-4yk05obra0icWHPXaJ+Wj+xxDRkVYg/VsrXTQUdHJIc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/zha-quirks/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zha-quirks"; pname = "zha-quirks";
version = "0.0.66"; version = "0.0.67";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zigpy"; owner = "zigpy";
repo = "zha-device-handlers"; repo = "zha-device-handlers";
rev = version; rev = version;
sha256 = "18g0i6b60ndfmbvdsx5pniq56fyc5k39ylp3sjhrfjcj434wvbvc"; sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

8
pkgs/development/python-modules/zwave-js-server-python/default.nix
View file

@ -2,6 +2,7 @@
, aiohttp , aiohttp
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pydantic
, pytest-aiohttp , pytest-aiohttp
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
@ -9,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zwave-js-server-python"; pname = "zwave-js-server-python";
version = "0.34.0"; version = "0.35.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,13 +19,16 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-hqq/CYlM9ZahDiH3iFLFzfE22CB19WQnFIDt+gCrEXU="; sha256 = "sha256-WmpXQttcQ3Z/SFkNPfmvPWPGzWectQBoI9+bL2QYeaY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
pydantic
]; ];
doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0";
checkInputs = [ checkInputs = [
pytest-aiohttp pytest-aiohttp
pytestCheckHook pytestCheckHook

4
pkgs/development/tools/clj-kondo/default.nix
View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "clj-kondo"; pname = "clj-kondo";
version = "2022.02.09"; version = "2022.03.04";
src = fetchurl { src = fetchurl {
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-WfPjn0S7Jd6zFcfaudcSsx9d5luyZuaeB8lFaOLg21w="; sha256 = "sha256-x/mDyWYxWR5H894n+BCBaxgRLQLPgVCip59nOUbavpk=";
}; };
extraNativeImageBuildArgs = [ extraNativeImageBuildArgs = [

2
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View file

@ -174,7 +174,7 @@ in rec {
let let
package = lib.importJSON packageJSON; package = lib.importJSON packageJSON;
packageGlobs = package.workspaces; packageGlobs = if lib.isList package.workspaces then package.workspaces else package.workspaces.packages;
globElemToRegex = lib.replaceStrings ["*"] [".*"]; globElemToRegex = lib.replaceStrings ["*"] [".*"];

2
pkgs/games/vimgolf/Gemfile Normal file
View file

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'vimgolf'

19
pkgs/games/vimgolf/Gemfile.lock Normal file
View file

@ -0,0 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
highline (2.0.3)
json_pure (2.6.1)
thor (1.2.1)
vimgolf (0.5.0)
highline (~> 2.0, >= 2.0.3)
json_pure (~> 2.3, >= 2.3.1)
thor (~> 1.0, >= 1.0.1)
PLATFORMS
ruby
DEPENDENCIES
vimgolf
BUNDLED WITH
2.1.4

17
pkgs/games/vimgolf/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ lib, bundlerApp, bundlerUpdateScript }:
bundlerApp {
pname = "vimgolf";
gemdir = ./.;
exes = [ "vimgolf" ];
passthru.updateScript = bundlerUpdateScript "vimgolf";
meta = with lib; {
description = "A game that tests Vim efficiency";
homepage = "https://vimgolf.com";
license = licenses.mit;
maintainers = with maintainers; [ leungbk ];
platforms = platforms.unix;
};
}

43
pkgs/games/vimgolf/gemset.nix Normal file
View file

@ -0,0 +1,43 @@
{
highline = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
type = "gem";
};
version = "2.0.3";
};
json_pure = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05ddn30jkpw6anfakfm7lffnrl2i0265ryrrwa4j0ivihjr95y82";
type = "gem";
};
version = "2.6.1";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
type = "gem";
};
version = "1.2.1";
};
vimgolf = {
dependencies = ["highline" "json_pure" "thor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "190dzqkvshd4i6jf30xnpm4sczraw6rdh4wvfh6qnmg0czmj0sny";
type = "gem";
};
version = "0.5.0";
};
}

4
pkgs/misc/lilypond/default.nix
View file

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lilypond"; pname = "lilypond";
version = "2.22.1"; version = "2.22.2";
src = fetchurl { src = fetchurl {
url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74=";
}; };
postInstall = '' postInstall = ''

34
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2022.2.9"; version = "2022.3.1";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];
@ -44,7 +44,6 @@
"apache_kafka" = ps: with ps; [ aiokafka ]; "apache_kafka" = ps: with ps; [ aiokafka ];
"apcupsd" = ps: with ps; [ apcaccess ]; "apcupsd" = ps: with ps; [ apcaccess ];
"api" = ps: with ps; [ aiohttp-cors ]; "api" = ps: with ps; [ aiohttp-cors ];
"apns" = ps: with ps; [ ]; # missing inputs: apns2
"apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ];
"apprise" = ps: with ps; [ apprise ]; "apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ aprslib geopy ]; "aprs" = ps: with ps; [ aprslib geopy ];
@ -166,7 +165,7 @@
"deconz" = ps: with ps; [ pydeconz ]; "deconz" = ps: with ps; [ pydeconz ];
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"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 ]; "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 ];
"delijn" = ps: with ps; [ pydelijn ]; "delijn" = ps: with ps; [ pydelijn ];
"deluge" = ps: with ps; [ deluge-client ]; "deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ];
@ -188,12 +187,13 @@
"digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
"directv" = ps: with ps; [ directv ]; "directv" = ps: with ps; [ directv ];
"discogs" = ps: with ps; [ discogs-client ]; "discogs" = ps: with ps; [ discogs-client ];
"discord" = ps: with ps; [ discordpy ]; "discord" = ps: with ps; [ nextcord ];
"discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ];
"dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_detect" = ps: with ps; [ face_recognition ];
"dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ];
"dlink" = ps: with ps; [ ]; # missing inputs: pyW215 "dlink" = ps: with ps; [ ]; # missing inputs: pyW215
"dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
"dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ];
"dnsip" = ps: with ps; [ aiodns ]; "dnsip" = ps: with ps; [ aiodns ];
"dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi
"doods" = ps: with ps; [ pillow pydoods ]; "doods" = ps: with ps; [ pillow pydoods ];
@ -224,7 +224,7 @@
"eight_sleep" = ps: with ps; [ pyeight ]; "eight_sleep" = ps: with ps; [ pyeight ];
"elgato" = ps: with ps; [ elgato ]; "elgato" = ps: with ps; [ elgato ];
"eliqonline" = ps: with ps; [ eliqonline ]; "eliqonline" = ps: with ps; [ eliqonline ];
"elkm1" = ps: with ps; [ elkm1-lib ]; "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib ifaddr ];
"elmax" = ps: with ps; [ elmax-api ]; "elmax" = ps: with ps; [ elmax-api ];
"elv" = ps: with ps; [ pypca ]; "elv" = ps: with ps; [ pypca ];
"emby" = ps: with ps; [ pyemby ]; "emby" = ps: with ps; [ pyemby ];
@ -273,6 +273,7 @@
"fireservicerota" = ps: with ps; [ pyfireservicerota ]; "fireservicerota" = ps: with ps; [ pyfireservicerota ];
"firmata" = ps: with ps; [ pymata-express ]; "firmata" = ps: with ps; [ pymata-express ];
"fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
"fivem" = ps: with ps; [ ]; # missing inputs: fivem-api
"fixer" = ps: with ps; [ fixerio ]; "fixer" = ps: with ps; [ fixerio ];
"fjaraskupan" = ps: with ps; [ fjaraskupan ]; "fjaraskupan" = ps: with ps; [ fjaraskupan ];
"fleetgo" = ps: with ps; [ ritassist ]; "fleetgo" = ps: with ps; [ ritassist ];
@ -324,7 +325,6 @@
"gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitlab_ci" = ps: with ps; [ python-gitlab ];
"gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy
"glances" = ps: with ps; [ glances-api ]; "glances" = ps: with ps; [ glances-api ];
"gntp" = ps: with ps; [ gntp ];
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
"goalzero" = ps: with ps; [ goalzero ]; "goalzero" = ps: with ps; [ goalzero ];
"gogogate2" = ps: with ps; [ ismartgate ]; "gogogate2" = ps: with ps; [ ismartgate ];
@ -446,7 +446,7 @@
"kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client
"kmtronic" = ps: with ps; [ pykmtronic ]; "kmtronic" = ps: with ps; [ pykmtronic ];
"knx" = ps: with ps; [ xknx ]; "knx" = ps: with ps; [ xknx ];
"kodi" = ps: with ps; [ pykodi ]; "kodi" = ps: with ps; [ aiohttp-cors pykodi ];
"konnected" = ps: with ps; [ aiohttp-cors konnected ]; "konnected" = ps: with ps; [ aiohttp-cors konnected ];
"kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore
"kraken" = ps: with ps; [ krakenex pykrakenapi ]; "kraken" = ps: with ps; [ krakenex pykrakenapi ];
@ -532,11 +532,12 @@
"minio" = ps: with ps; [ minio ]; "minio" = ps: with ps; [ minio ];
"mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt
"mjpeg" = ps: with ps; [ ]; "mjpeg" = ps: with ps; [ ];
"mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ]; "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa pillow ];
"mochad" = ps: with ps; [ ]; # missing inputs: pymochad "mochad" = ps: with ps; [ ]; # missing inputs: pymochad
"modbus" = ps: with ps; [ pymodbus ]; "modbus" = ps: with ps; [ pymodbus ];
"modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ]; "modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ];
"modern_forms" = ps: with ps; [ aiomodernforms ]; "modern_forms" = ps: with ps; [ aiomodernforms ];
"moehlenhoff_alpha2" = ps: with ps; [ ]; # missing inputs: moehlenhoff-alpha2
"mold_indicator" = ps: with ps; [ ]; "mold_indicator" = ps: with ps; [ ];
"monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
"moon" = ps: with ps; [ ]; "moon" = ps: with ps; [ ];
@ -680,6 +681,7 @@
"proxy" = ps: with ps; [ pillow ]; "proxy" = ps: with ps; [ pillow ];
"ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen
"pulseaudio_loopback" = ps: with ps; [ pulsectl ]; "pulseaudio_loopback" = ps: with ps; [ pulsectl ];
"pure_energie" = ps: with ps; [ gridnet ];
"push" = ps: with ps; [ aiohttp-cors ]; "push" = ps: with ps; [ aiohttp-cors ];
"pushbullet" = ps: with ps; [ pushbullet ]; "pushbullet" = ps: with ps; [ pushbullet ];
"pushover" = ps: with ps; [ pushover-complete ]; "pushover" = ps: with ps; [ pushover-complete ];
@ -697,6 +699,7 @@
"qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
"rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ];
"radarr" = ps: with ps; [ ]; "radarr" = ps: with ps; [ ];
"radio_browser" = ps: with ps; [ radios ];
"radiotherm" = ps: with ps; [ radiotherm ]; "radiotherm" = ps: with ps; [ radiotherm ];
"rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird
"raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy
@ -791,7 +794,7 @@
"skybeacon" = ps: with ps; [ pygatt ]; "skybeacon" = ps: with ps; [ pygatt ];
"skybell" = ps: with ps; [ skybellpy ]; "skybell" = ps: with ps; [ skybellpy ];
"slack" = ps: with ps; [ slackclient ]; "slack" = ps: with ps; [ slackclient ];
"sleepiq" = ps: with ps; [ sleepyq ]; "sleepiq" = ps: with ps; [ asyncsleepiq ];
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api "slide" = ps: with ps; [ ]; # missing inputs: goslide-api
"sma" = ps: with ps; [ pysma ]; "sma" = ps: with ps; [ pysma ];
"smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
@ -814,7 +817,7 @@
"soma" = ps: with ps; [ pysoma ]; "soma" = ps: with ps; [ pysoma ];
"somfy" = ps: with ps; [ aiohttp-cors pymfy ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ];
"somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ];
"sonarr" = ps: with ps; [ sonarr ]; "sonarr" = ps: with ps; [ aiopyarr ];
"songpal" = ps: with ps; [ python-songpal ]; "songpal" = ps: with ps; [ python-songpal ];
"sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ];
"sony_projector" = ps: with ps; [ pysdcp ]; "sony_projector" = ps: with ps; [ pysdcp ];
@ -924,7 +927,7 @@
"twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
"twinkly" = ps: with ps; [ ttls ]; "twinkly" = ps: with ps; [ ttls ];
"twitch" = ps: with ps; [ python-twitch-client ]; "twitch" = ps: with ps; [ twitchapi ];
"twitter" = ps: with ps; [ twitterapi ]; "twitter" = ps: with ps; [ twitterapi ];
"ubus" = ps: with ps; [ openwrt-ubus-rpc ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ];
"ue_smart_radio" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ];
@ -990,6 +993,7 @@
"wilight" = ps: with ps; [ pywilight ]; "wilight" = ps: with ps; [ pywilight ];
"wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy
"withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api
"wiz" = ps: with ps; [ aiohttp-cors ifaddr pywizlight ];
"wled" = ps: with ps; [ wled ]; "wled" = ps: with ps; [ wled ];
"wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset
"workday" = ps: with ps; [ holidays ]; "workday" = ps: with ps; [ holidays ];
@ -998,7 +1002,6 @@
"worxlandroid" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ];
"wsdot" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ];
"x10" = ps: with ps; [ ]; "x10" = ps: with ps; [ ];
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
"xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ];
"xbox_live" = ps: with ps; [ xboxapi ]; "xbox_live" = ps: with ps; [ xboxapi ];
"xeoma" = ps: with ps; [ pyxeoma ]; "xeoma" = ps: with ps; [ pyxeoma ];
@ -1031,6 +1034,7 @@
"zoneminder" = ps: with ps; [ zm-py ]; "zoneminder" = ps: with ps; [ zm-py ];
"zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
"zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; "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
}; };
# components listed in tests/components for which all dependencies are packaged # components listed in tests/components for which all dependencies are packaged
supportedComponentsWithTests = [ supportedComponentsWithTests = [
@ -1143,6 +1147,7 @@
"directv" "directv"
"discovery" "discovery"
"dlna_dmr" "dlna_dmr"
"dlna_dms"
"dnsip" "dnsip"
"doorbird" "doorbird"
"dsmr" "dsmr"
@ -1343,6 +1348,7 @@
"min_max" "min_max"
"minecraft_server" "minecraft_server"
"minio" "minio"
"mjpeg"
"mobile_app" "mobile_app"
"modbus" "modbus"
"modem_callerid" "modem_callerid"
@ -1423,6 +1429,7 @@
"prometheus" "prometheus"
"prosegur" "prosegur"
"proximity" "proximity"
"pure_energie"
"push" "push"
"pushbullet" "pushbullet"
"pvoutput" "pvoutput"
@ -1431,6 +1438,7 @@
"qld_bushfire" "qld_bushfire"
"rachio" "rachio"
"radarr" "radarr"
"radio_browser"
"rainforest_eagle" "rainforest_eagle"
"rainmachine" "rainmachine"
"random" "random"
@ -1459,6 +1467,7 @@
"safe_mode" "safe_mode"
"samsungtv" "samsungtv"
"scene" "scene"
"scrape"
"screenlogic" "screenlogic"
"script" "script"
"search" "search"
@ -1605,6 +1614,7 @@
"whois" "whois"
"wiffi" "wiffi"
"wilight" "wilight"
"wiz"
"wled" "wled"
"workday" "workday"
"worldclock" "worldclock"

34
pkgs/servers/home-assistant/default.nix
View file

@ -29,7 +29,27 @@
let let
defaultOverrides = [ defaultOverrides = [
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")
# pytest-aiohttp>0.3.0 breaks home-assistant tests
(self: super: {
pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {
version = "0.3.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9";
};
});
aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: {
doCheck = false; # requires aiohttp>=1.0.0
});
})
(self: super: { (self: super: {
huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
@ -58,7 +78,7 @@ let
}) })
# Pinned due to API changes in 0.1.0 # Pinned due to API changes in 0.1.0
(mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=")
# Pinned due to API changes >0.3.5.3 # Pinned due to API changes >0.3.5.3
(self: super: { (self: super: {
@ -105,12 +125,12 @@ let
}) })
]; ];
mkOverride = attrName: version: sha256: mkOverride = attrName: version: hash:
self: super: { self: super: {
${attrName} = super.${attrName}.overridePythonAttrs (oldAttrs: { ${attrName} = super.${attrName}.overridePythonAttrs (oldAttrs: {
inherit version; inherit version;
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version sha256; inherit version hash;
}; };
}); });
}; };
@ -138,7 +158,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2022.2.9"; hassVersion = "2022.3.1";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -156,7 +176,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
hash = "sha256-So/MAKyFVa1TchrVE4ego1fRbgOXCoXR3w/rJLFSBqI="; hash = "sha256-bihb6DL8hQuRnJZp39Lh2qfTXr0tFxn7FHFZewttNOc=";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling
@ -217,6 +237,8 @@ in python.pkgs.buildPythonApplication rec {
yarl yarl
# Not in setup.py, but used in homeassistant/util/package.py # Not in setup.py, but used in homeassistant/util/package.py
setuptools setuptools
# Not in setup.py, but uncounditionally imported via tests/conftest.py
paho-mqtt
] ++ componentBuildInputs ++ extraBuildInputs; ] ++ componentBuildInputs ++ extraBuildInputs;
makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";

4
pkgs/servers/home-assistant/frontend.nix
View file

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here # 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 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20220203.1"; version = "20220301.0";
format = "wheel"; format = "wheel";
src = fetchPypi { src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend"; pname = "home_assistant_frontend";
dist = "py3"; dist = "py3";
python = "py3"; python = "py3";
sha256 = "sha256-6+TzBhHo9+eo6Hlk8RF+BAt4O0i759iAN+dKAPDmTNY="; sha256 = "sha256-Gshw8GIiZfFHmldvxBhUKZ5NFWuBIA6ug7m7eEfQ+ao=";
}; };
# there is nothing to strip in this package # there is nothing to strip in this package

12
pkgs/servers/home-assistant/tests.nix
View file

@ -11,8 +11,9 @@ let
config = [ pydispatcher ]; config = [ pydispatcher ];
generic = [ ha-av ]; generic = [ ha-av ];
google_translate = [ mutagen ]; google_translate = [ mutagen ];
lovelace = [ PyChromecast ];
nest = [ ha-av ]; nest = [ ha-av ];
onboarding = [ pymetno rpi-bad-power ]; onboarding = [ pymetno radios rpi-bad-power ];
version = [ aioaseko ]; version = [ aioaseko ];
voicerss = [ mutagen ]; voicerss = [ mutagen ];
yandextts = [ mutagen ]; yandextts = [ mutagen ];
@ -28,6 +29,13 @@ let
]; ];
}; };
extraDisabledTests = {
roku = [
# homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska)
"test_services_play_media_audio"
];
};
extraPytestFlagsArray = { extraPytestFlagsArray = {
asuswrt = [ asuswrt = [
# asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error
@ -45,6 +53,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
++ home-assistant.getPackages component home-assistant.python.pkgs ++ home-assistant.getPackages component home-assistant.python.pkgs
++ extraCheckInputs.${component} or [ ]; ++ extraCheckInputs.${component} or [ ];
disabledTests = old.disabledTests ++ extraDisabledTests.${component} or [];
disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ];
pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray
@ -59,6 +68,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
broken = lib.elem component [ broken = lib.elem component [
"airtouch4" "airtouch4"
"dnsip" "dnsip"
"zwave"
]; ];
# upstream only tests on Linux, so do we. # upstream only tests on Linux, so do we.
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

4
pkgs/servers/jackett/default.nix
View file

@ -9,13 +9,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.20.660"; version = "0.20.663";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "9k9v5/5zlpQJgBPlBYmCxUoucKL6D2vBFhjisvIAM4A="; sha256 = "ZlKjuY3zHciImprDpaiBMnTJZtiegTpjhBcXe4LuYrQ=";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

6
pkgs/servers/monitoring/grafana/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
version = "8.4.2"; version = "8.4.3";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ]; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];
@ -10,12 +10,12 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "sha256-ZRVX7nqBsjTODRtfdL4l/azC3ZH2WJCBOXjldkNvweE="; sha256 = "sha256-+d4pcuNLbM2PY1rFpnIjoakpr63kMqI/SjpTRZecRXw=";
}; };
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-4k+6KMoSzoEffPFl/y2paheeY1F35jRPsHtH05Zxr/Y="; sha256 = "sha256-l3GPSUci812KbHKMXHtS4OlvYyuKlBOeQCLtLvvkhzI=";
}; };
vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0=";

8
pkgs/tools/admin/aliyun-cli/default.nix
View file

@ -2,21 +2,21 @@
buildGoModule rec { buildGoModule rec {
pname = "aliyun-cli"; pname = "aliyun-cli";
version = "3.0.109"; version = "3.0.110";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "aliyun"; owner = "aliyun";
repo = pname; repo = pname;
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-YlJGYt/depabhMPQtS1dwmFSxoThUEXOWi7KSWx7cRo="; sha256 = "sha256-Omi82feAq0tBuMSuA25JtDatfSJwWcxK3KkWkSI9ax4=";
}; };
vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY="; vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY=";
subPackages = [ "main" ]; subPackages = [ "main" ];
ldFlags = [ "-s" "-w" "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" ]; ldflags = [ "-s" "-w" "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" ];
postInstall = '' postInstall = ''
mv $out/bin/main $out/bin/aliyun mv $out/bin/main $out/bin/aliyun
@ -25,7 +25,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
description = "Tool to manage and use Alibaba Cloud resources through a command line interface"; description = "Tool to manage and use Alibaba Cloud resources through a command line interface";
homepage = "https://github.com/aliyun/aliyun-cli"; homepage = "https://github.com/aliyun/aliyun-cli";
changelog = "https://github.com/aliyun/aliyun-cli/raw/v${version}/CHANGELOG.md"; changelog = "https://github.com/aliyun/aliyun-cli/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ornxka ]; maintainers = with maintainers; [ ornxka ];
}; };

6
pkgs/tools/admin/trivy/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "trivy"; pname = "trivy";
version = "0.24.1"; version = "0.24.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/XkHvXzF7SG5niIknd+wh1Uc0ZbfrklgTkZigjz3aNY="; sha256 = "sha256-xMLSou+8kIQVEJlkA7ygv623hvETcEAdyFPR3HJr5ZQ=";
}; };
vendorSha256 = "sha256-C3JpjDXQ6sUnz9ixO3w2aP3G122nYHezYrNW/FZqlJQ="; vendorSha256 = "sha256-qRkxDvrqMVOsz5r3m3I+E0HAVoUwFykkfGzTz9Qc/S4=";
excludedPackages = "misc"; excludedPackages = "misc";

6
pkgs/tools/networking/amass/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "amass"; pname = "amass";
version = "3.17.0"; version = "3.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OWASP"; owner = "OWASP";
repo = "Amass"; repo = "Amass";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Ml/NyxrqK17pAxUFu0U191BPdmnv4SCZPkBKLzGsk7c="; sha256 = "sha256-AFy0Ob6caU3yGC9s5Til5sYZ3A4qiEeU96OfeMlR/Q4=";
}; };
vendorSha256 = "sha256-tGIZ8D1ecLV2HNXrBvLEVVQbmwoR1arwwLZ0oTx1b7k="; vendorSha256 = "sha256-6qfHoP7TOmRZLIiijRfQxyct+486TXQ18cdH8pdhwmQ=";
outputs = [ "out" "wordlists" ]; outputs = [ "out" "wordlists" ];

4
pkgs/tools/networking/dnsproxy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dnsproxy"; pname = "dnsproxy";
version = "0.41.2"; version = "0.41.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdguardTeam"; owner = "AdguardTeam";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Bo6OxHNZYA1cP2iP/QnaN80DcwBGIVCQXH/mc75hFUY="; sha256 = "sha256-p5kfpqqTg1wXPYTBScjUGClSKT6yb7ZSnzia2xTQwfo=";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/tools/networking/mubeng/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "mubeng"; pname = "mubeng";
version = "0.9.2"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kitabisa"; owner = "kitabisa";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uCE2Ku4OFz9Qfk7lxKjTU/KnrmRFqfunykPboPY2s0g="; sha256 = "sha256-qEIPu4miZpWL19N36DsKMbckXbHDTTZjp2ccZrV3LFc=";
}; };
vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o="; vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o=";

4
pkgs/tools/security/cfripper/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "cfripper"; pname = "cfripper";
version = "1.4.2"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Skyscanner"; owner = "Skyscanner";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-WSDCYKiU1VTi3j7vZ87HjHOShIN+PF7pwR4IVTalbmo="; hash = "sha256-nomNjt/BV/Tu/9w4IEu3tXWQw4/wLTc64khdnQeliH0=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

6
pkgs/tools/security/dnsx/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "dnsx"; pname = "dnsx";
version = "1.0.8"; version = "1.0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "dnsx"; repo = "dnsx";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU="; sha256 = "sha256-8c9gDD/g5oP9GQV1ghb2UN9w5EccvxyDvJUAtgV8q7Y=";
}; };
vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4="; vendorSha256 = "sha256-uvquc0bWwYzeeTuKlYaQp9r+O23MMs1Ajz1DPJ2qrnE=";
meta = with lib; { meta = with lib; {
description = "Fast and multi-purpose DNS toolkit"; description = "Fast and multi-purpose DNS toolkit";

6
pkgs/tools/security/gomapenum/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gomapenum"; pname = "gomapenum";
version = "1.0.3"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nodauf"; owner = "nodauf";
repo = "GoMapEnum"; repo = "GoMapEnum";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AjHqD9r4ZU5NCqXEovvQuV4eeMLBy2jO/uqZQiCTyNI="; sha256 = "sha256-a0JpHk5pUe+MkcmJl871JwkOfFDg3S4yOzFIeXCReLE=";
}; };
vendorSha256 = "sha256-65NF814w1IUgSDuLLIqfbsf22va4AUC2E05ZgmuOHGY="; vendorSha256 = "sha256-5C0dDY/42H8oHNdQaKYiuqpi2QqqgHC7VMO/0kFAofY=";
postInstall = '' postInstall = ''
mv $out/bin/src $out/bin/$pname mv $out/bin/src $out/bin/$pname

4
pkgs/tools/security/knockpy/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "knockpy"; pname = "knockpy";
version = "5.2.0"; version = "5.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "guelfoweb"; owner = "guelfoweb";
repo = "knock"; repo = "knock";
rev = version; rev = version;
hash = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o="; hash = "sha256-aM78If4/zW/0CqVjZHDbHrrWDuU1VSVhX7dfy9FR098=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

6
pkgs/top-level/all-packages.nix
View file

@ -1760,6 +1760,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
distrobox = callPackage ../applications/virtualization/distrobox { };
djmount = callPackage ../tools/filesystems/djmount { }; djmount = callPackage ../tools/filesystems/djmount { };
dgsh = callPackage ../shells/dgsh { }; dgsh = callPackage ../shells/dgsh { };
@ -28962,6 +28964,8 @@ with pkgs;
sipp = callPackage ../development/tools/misc/sipp { }; sipp = callPackage ../development/tools/misc/sipp { };
skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { };
soci = callPackage ../development/libraries/soci { }; soci = callPackage ../development/libraries/soci { };
socialscan = with python3.pkgs; toPythonApplication socialscan; socialscan = with python3.pkgs; toPythonApplication socialscan;
@ -29552,6 +29556,8 @@ with pkgs;
qtile = callPackage ../applications/window-managers/qtile { }; qtile = callPackage ../applications/window-managers/qtile { };
vimgolf = callPackage ../games/vimgolf { };
vimpc = callPackage ../applications/audio/vimpc { }; vimpc = callPackage ../applications/audio/vimpc { };
# this is a lower-level alternative to wrapNeovim conceived to handle # this is a lower-level alternative to wrapNeovim conceived to handle

8
pkgs/top-level/python-packages.nix
View file

@ -704,6 +704,8 @@ in {
asyncpg = callPackage ../development/python-modules/asyncpg { }; asyncpg = callPackage ../development/python-modules/asyncpg { };
asyncsleepiq = callPackage ../development/python-modules/asyncsleepiq { };
asyncssh = callPackage ../development/python-modules/asyncssh { }; asyncssh = callPackage ../development/python-modules/asyncssh { };
asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; asyncstdlib = callPackage ../development/python-modules/asyncstdlib { };
@ -3565,6 +3567,8 @@ in {
growattserver = callPackage ../development/python-modules/growattserver { }; growattserver = callPackage ../development/python-modules/growattserver { };
gridnet = callPackage ../development/python-modules/gridnet { };
grip = callPackage ../development/python-modules/grip { }; grip = callPackage ../development/python-modules/grip { };
groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { }; groestlcoin_hash = callPackage ../development/python-modules/groestlcoin_hash { };
@ -8211,6 +8215,8 @@ in {
python-toolbox = callPackage ../development/python-modules/python-toolbox { }; python-toolbox = callPackage ../development/python-modules/python-toolbox { };
python-trovo = callPackage ../development/python-modules/python-trovo { };
python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; python-twitch-client = callPackage ../development/python-modules/python-twitch-client { };
python-twitter = callPackage ../development/python-modules/python-twitter { }; python-twitter = callPackage ../development/python-modules/python-twitter { };
@ -8539,6 +8545,8 @@ in {
radio_beam = callPackage ../development/python-modules/radio_beam { }; radio_beam = callPackage ../development/python-modules/radio_beam { };
radios = callPackage ../development/python-modules/radios { };
radiotherm = callPackage ../development/python-modules/radiotherm { }; radiotherm = callPackage ../development/python-modules/radiotherm { };
radish-bdd = callPackage ../development/python-modules/radish-bdd { }; radish-bdd = callPackage ../development/python-modules/radish-bdd { };