gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-03-03 01:43:54 +00:00
committed by GitHub
parent e57c5a4ddc 7a63cf30f8
commit 3a058a8351
68 changed files with 583 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/misc/gitea.nix
+15 -15
View File
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.gitea;
opt = options.services.gitea;
gitea = cfg.package;
exe = lib.getExe cfg.package;
pg = config.services.postgresql;
useMysql = cfg.database.type == "mysql";
usePostgresql = cfg.database.type == "postgres";
@@ -248,7 +248,7 @@ in
staticRootPath = mkOption {
type = types.either types.str types.path;
default = gitea.data;
default = cfg.package.data;
defaultText = literalExpression "package.data";
example = "/var/lib/gitea/data";
description = lib.mdDoc "Upper level of template and static files path.";
@@ -481,14 +481,14 @@ in
# If we have a folder or symlink with gitea locales, remove it
# And symlink the current gitea locales in place
"L+ '${cfg.stateDir}/conf/locale' - - - - ${gitea.out}/locale"
"L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale"
];
systemd.services.gitea = {
description = "gitea";
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
wantedBy = [ "multi-user.target" ];
path = [ gitea pkgs.git pkgs.gnupg ];
path = [ cfg.package pkgs.git pkgs.gnupg ];
# In older versions the secret naming for JWT was kind of confusing.
# The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET
@@ -512,7 +512,7 @@ in
cp -f ${configFile} ${runConfig}
if [ ! -s ${secretKey} ]; then
${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
${exe} generate secret SECRET_KEY > ${secretKey}
fi
# Migrate LFS_JWT_SECRET filename
@@ -521,15 +521,15 @@ in
fi
if [ ! -s ${oauth2JwtSecret} ]; then
${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret}
${exe} generate secret JWT_SECRET > ${oauth2JwtSecret}
fi
if [ ! -s ${lfsJwtSecret} ]; then
${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
${exe} generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
fi
if [ ! -s ${internalToken} ]; then
${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken}
${exe} generate secret INTERNAL_TOKEN > ${internalToken}
fi
chmod u+w '${runConfig}'
@@ -548,15 +548,15 @@ in
''}
# run migrations/init the database
${gitea}/bin/gitea migrate
${exe} migrate
# update all hooks' binary paths
${gitea}/bin/gitea admin regenerate hooks
${exe} admin regenerate hooks
# update command option in authorized_keys
if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]
then
${gitea}/bin/gitea admin regenerate keys
${exe} admin regenerate keys
fi
'';
@@ -565,7 +565,7 @@ in
User = cfg.user;
Group = "gitea";
WorkingDirectory = cfg.stateDir;
ExecStart = "${gitea}/bin/gitea web --pid /run/gitea/gitea.pid";
ExecStart = "${exe} web --pid /run/gitea/gitea.pid";
Restart = "always";
# Runtime directory and mode
RuntimeDirectory = "gitea";
@@ -635,7 +635,7 @@ in
systemd.services.gitea-dump = mkIf cfg.dump.enable {
description = "gitea dump";
after = [ "gitea.service" ];
path = [ gitea ];
path = [ cfg.package ];
environment = {
USER = cfg.user;
@@ -646,7 +646,7 @@ in
serviceConfig = {
Type = "oneshot";
User = cfg.user;
ExecStart = "${gitea}/bin/gitea dump --type ${cfg.dump.type}" + optionalString (cfg.dump.file != null) " --file ${cfg.dump.file}";
ExecStart = "${exe} dump --type ${cfg.dump.type}" + optionalString (cfg.dump.file != null) " --file ${cfg.dump.file}";
WorkingDirectory = cfg.dump.backupDir;
};
};
@@ -658,5 +658,5 @@ in
timerConfig.OnCalendar = cfg.dump.interval;
};
};
meta.maintainers = with lib.maintainers; [ srhb ma27 ];
meta.maintainers = with lib.maintainers; [ srhb ma27 thehedgeh0g ];
}
pkgs/applications/emulators/dosbox-staging/default.nix
+20 -21
View File
@@ -1,10 +1,15 @@
{ alsa-lib
, copyDesktopItems
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, SDL2_image
, SDL2_net
, alsa-lib
, copyDesktopItems
, fluidsynth
, glib
, gtest
, lib
, irr1
, libGL
, libGLU
, libjack2
@@ -20,22 +25,17 @@
, ninja
, opusfile
, pkg-config
, irr1
, SDL2
, SDL2_image
, SDL2_net
, speexdsp
, stdenv
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "dosbox-staging";
version = "0.80.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
owner = "dosbox-staging";
repo = "dosbox-staging";
rev = "v${self.version}";
hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc=";
};
@@ -91,17 +91,16 @@ stdenv.mkDerivation rec {
# original dosbox. Doing it this way allows us to work with frontends and
# launchers that expect the binary to be named dosbox, but get out of the
# way of vanilla dosbox if the user desires to install that as well.
mv $out/bin/dosbox $out/bin/${pname}
mv $out/bin/dosbox $out/bin/dosbox-staging
makeWrapper $out/bin/dosbox-staging $out/bin/dosbox
# Create a symlink to dosbox manual instead of merely copying it
# Create a symlink to dosbox manual instead of copying it
pushd $out/share/man/man1/
mv dosbox.1.gz ${pname}.1.gz
ln -s ${pname}.1.gz dosbox.1.gz
ln -s dosbox.1.gz dosbox-staging.1.gz
popd
'';
meta = with lib; {
meta = {
homepage = "https://dosbox-staging.github.io/";
description = "A modernized DOS emulator";
longDescription = ''
@@ -110,10 +109,10 @@ stdenv.mkDerivation rec {
existing DOSBox codebase while leveraging modern development tools and
practices.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ joshuafern AndersonTorres ];
platforms = platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ joshuafern AndersonTorres ];
platforms = lib.platforms.unix;
priority = 101;
};
}
})
# TODO: report upstream about not finding SDL2_net
pkgs/applications/misc/oxker/default.nix
+3 -3
View File
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "oxker";
version = "0.2.3";
version = "0.2.4";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-J+3wi1nqkxR3ZDfR+F3rvFjUz1DJ7/jhjmcvFdMzWYc=";
sha256 = "sha256-wYGaBXorAcwFnlUixrOP63s32WV1V7/8SUOBXIeLB7o=";
};
cargoHash = "sha256-oQPCUm/X2vt6wN5AKhtgq8tzQQrp0H42bBK7Az+I9BE=";
cargoHash = "sha256-rdzr6oOrJNTX3dCSO3ZdKNFZ31/CHdupKL7QmmuuX7I=";
meta = with lib; {
description = "A simple tui to view & control docker containers";
pkgs/applications/networking/cluster/lens/darwin.nix
+29
View File
@@ -0,0 +1,29 @@
{ lib, stdenv, undmg, fetchurl }:
stdenv.mkDerivation rec {
pname = "lens";
version = "2022.12";
build = "${version}.11410-latest";
appName = "Lens";
sourceRoot = "${appName}.app";
src = fetchurl {
url = "https://api.k8slens.dev/binaries/Lens-${build}-arm64.dmg";
sha256 = "sha256-PKWJ2CZ/wacbJnrCZdYwYJzbFVhjIGAw60UGhdw11Mc=";
};
buildInputs = [ undmg ];
installPhase = ''
mkdir -p "$out/Applications/${appName}.app"
cp -R . "$out/Applications/${appName}.app"
'';
meta = with lib; {
description = "The Kubernetes IDE";
homepage = "https://k8slens.dev/";
license = licenses.mit;
maintainers = with maintainers; [ dbirks ];
platforms = [ "aarch64-darwin" ];
};
}
pkgs/applications/networking/cluster/lens/default.nix
+5 -43
View File
@@ -1,44 +1,6 @@
{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }:
{ stdenv, callPackage }:
let
pname = "lens";
version = "6.3.0";
build = "2022.12.221341-latest";
name = "${pname}-${version}";
src = fetchurl {
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc=";
name = "${pname}.AppImage";
};
appimageContents = appimageTools.extractType2 {
inherit name src;
};
in
appimageTools.wrapType2 {
inherit name src;
extraInstallCommands =
''
mv $out/bin/${name} $out/bin/${pname}
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \
$out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Icon=lens' 'Icon=${pname}' \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "The Kubernetes IDE";
homepage = "https://k8slens.dev/";
license = licenses.mit;
maintainers = with maintainers; [ dbirks RossComputerGuy ];
platforms = [ "x86_64-linux" ];
};
}
if stdenv.isDarwin then
callPackage ./darwin.nix { }
else
callPackage ./linux.nix { }
pkgs/applications/networking/cluster/lens/linux.nix
+44
View File
@@ -0,0 +1,44 @@
{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }:
let
pname = "lens";
version = "6.3.0";
build = "2022.12.221341-latest";
name = "${pname}-${version}";
src = fetchurl {
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc=";
name = "${pname}.AppImage";
};
appimageContents = appimageTools.extractType2 {
inherit name src;
};
in
appimageTools.wrapType2 {
inherit name src;
extraInstallCommands =
''
mv $out/bin/${name} $out/bin/${pname}
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \
$out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Icon=lens' 'Icon=${pname}' \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "The Kubernetes IDE";
homepage = "https://k8slens.dev/";
license = licenses.mit;
maintainers = with maintainers; [ dbirks RossComputerGuy ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/applications/networking/instant-messengers/dino/default.nix
+2 -2
View File
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "dino";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "v${version}";
sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ=";
sha256 = "sha256-1czey1/Zn96JneCUnhPMyffG9FVV4bA9aidNB7Ozkpo=";
};
postPatch = ''
pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
+3 -3
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "threema-desktop";
version = "1.2.21";
version = "1.2.27";
src = fetchurl {
# As Threema only offers a Latest Release url, the plan is to upload each
# new release url to web.archive.org until their Github releases page gets populated.
url = "https://web.archive.org/web/20220915175906if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
sha256 = "0icxn5whsvwmdmfbkfk4xnl3dn4iif5s5yw5hsimmyx066fq0qhb";
url = "https://web.archive.org/web/20230302151220/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";
sha256 = "0jx271zwqja7i7qdvhiyq5m6g19a12falfvxbkxrw7ab3ycds2px";
};
nativeBuildInputs = [
pkgs/applications/networking/mullvad-vpn/default.nix
+2 -2
View File
@@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2022.5";
version = "2023.1";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "sha256-G3B4kb+ugukYtCVH3HHI43u3n9G0dX6WyYUA3X/sZ+o=";
sha256 = "sha256-+Nh4CYjivjrCmohzQMSjb9z5bgACAvot5oUABPUFExQ=";
};
nativeBuildInputs = [
pkgs/applications/networking/mullvad/mullvad.nix
+17 -5
View File
@@ -3,6 +3,7 @@
, writeText
, rustPlatform
, fetchFromGitHub
, fetchpatch
, pkg-config
, protobuf
, makeWrapper
@@ -11,21 +12,32 @@
, libnftnl
, libmnl
, libwg
, enableOpenvpn ? true
, openvpn-mullvad
, shadowsocks-rust
}:
rustPlatform.buildRustPackage rec {
pname = "mullvad";
version = "2022.5";
version = "2023.1";
src = fetchFromGitHub {
owner = "mullvad";
repo = "mullvadvpn-app";
rev = version;
hash = "sha256-LiaELeEBIn/GZibKf25W3DHe+IkpaTY8UC7ca/7lp8k=";
hash = "sha256-BoduliiDOpzEPYHAjr636e7DbrhFnC/v9au6Mp9T/Qs=";
};
cargoHash = "sha256-KpBhdZce8Ug3ws7f1qg+5LtOMQw2Mf/uJsBg/TZSYyk=";
cargoHash = "sha256-5kK2IA0Z1dQbHlnGXNZHD+BycurshfpqrwcIEveWKT0=";
patches = [
# https://github.com/mullvad/mullvadvpn-app/pull/4389
# can be removed after next release
(fetchpatch {
name = "mullvad-version-dont-check-git.patch";
url = "https://github.com/mullvad/mullvadvpn-app/commit/8062cc74fc94bbe073189e78328901606c859d41.patch";
hash = "sha256-1BhCId0J1dxhPM3oOmhZB+07N+k1GlvAT1h6ayfx174=";
})
];
nativeBuildInputs = [
pkg-config
@@ -51,12 +63,12 @@ rustPlatform.buildRustPackage rec {
# Place all binaries in the 'mullvad-' namespace, even though these
# specific binaries aren't used in the lifetime of the program.
''
for bin in relay_list translations-converter; do
for bin in relay_list translations-converter tunnel-obfuscation; do
mv "$out/bin/$bin" "$out/bin/mullvad-$bin"
done
'' +
# Files necessary for OpenVPN tunnels to work.
''
lib.optionalString enableOpenvpn ''
mkdir -p $out/share/mullvad
cp dist-assets/ca.crt $out/share/mullvad
ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
pkgs/data/icons/numix-icon-theme-circle/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "23.02.25";
version = "23.02.28";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-JQK4GjL3piztBVXRnIMNxdB+XTXNaNvWg0wLLui4tRE=";
sha256 = "sha256-dSD5mjWH7ho+1LiZgzVjDkAIbj4XubC3ZKamyMokkds=";
};
nativeBuildInputs = [ gtk3 ];
pkgs/development/interpreters/clojure/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1224";
version = "1.11.1.1237";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-T55/uETQFBWYS9ZifbF3KW8vWoeInq/QxH7UabVkBVI=";
sha256 = "sha256-1uucH0/kx7w991kvZnwjRTSbVbu62W0j0/7iaRTZ5I8=";
};
nativeBuildInputs = [
pkgs/development/libraries/faudio/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "23.02";
version = "23.03";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY=";
sha256 = "sha256-sQbltmHmScSn5E1tE32uU16JQasjOnLW5N2m6+LC9CI=";
};
nativeBuildInputs = [cmake];
pkgs/development/libraries/intel-gmmlib/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
version = "22.3.3";
version = "22.3.4";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "intel-gmmlib-${version}";
sha256 = "sha256-ghCB9wrjixAX06KUYZUEL1Tq6fKSH7pqe3Ti1y/+a2U=";
sha256 = "sha256-V8mimy4yB7BO5YdbUh8byN9K6ylQ3lOLynQbXxiOUok=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/libglibutil/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libglibutil";
version = "1.0.67";
version = "1.0.68";
src = fetchFromGitHub {
owner = "sailfishos";
repo = pname;
rev = version;
sha256 = "sha256-SXyMmkyC1RZLIYhrG2TDcH/PDCHfrJOVZOX1PC3EDLg=";
sha256 = "sha256-FlBXSX6ZA6vDV1Kf1QU1XGxkyS3aWGSrwr2RtdVss10=";
};
outputs = [ "out" "dev" ];
pkgs/development/python-modules/aesedb/default.nix
+13 -6
View File
@@ -2,25 +2,32 @@
, aiowinreg
, buildPythonPackage
, colorama
, fetchPypi
, fetchFromGitHub
, pycryptodomex
, pythonOlder
, setuptools
, tqdm
, unicrypto
}:
buildPythonPackage rec {
pname = "aesedb";
version = "0.1.1";
format = "setuptools";
version = "0.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pnbzPVXr3qgBH7t5wNR+jbTdQGMdnLpV+xfgQjdc+7A=";
src = fetchFromGitHub {
owner = "skelsec";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-TXGRXo3754dEgRotDO5vSl9vj119Xday/176yem3cqk=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiowinreg
colorama
pkgs/development/python-modules/aiohue/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiohue";
version = "4.6.1";
version = "4.6.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ATM4s2W1Gw98TysfqHVA/McerZStHaUK5eMrSU9+uOI=";
hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/brother/default.nix
+3 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "brother";
version = "2.1.1";
version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-jMvbZ4/NOA3dnJUdDWk2KTRz1gBOC+oDE0ChGNdFl1o=";
hash = "sha256-bp4YerSTTsuWX3Yc+btlhwCNZO3eDxRgKNzLZFJbKV0=";
};
propagatedBuildInputs = [
@@ -41,6 +41,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python wrapper for getting data from Brother laser and inkjet printers via SNMP";
homepage = "https://github.com/bieniu/brother";
changelog = "https://github.com/bieniu/brother/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
pkgs/development/python-modules/devolo-plc-api/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "devolo-plc-api";
version = "1.1.0";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "2Fake";
repo = "devolo_plc_api";
rev = "refs/tags/v${version}";
hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo=";
hash = "sha256-Ua6XxFmvF2EDtCZTeVHGRfwNAMjX3p5s4Jo5ylutYqY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/elgato/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "elgato";
version = "3.0.0";
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "frenck";
repo = "python-elgato";
rev = "v${version}";
sha256 = "sha256-lGHRwDxxgi1QJvK3WrvwghoAZk5J1mdwD4+Is0n7Jgs=";
rev = "refs/tags/v${version}";
sha256 = "sha256-kyFnc/lMxgYy8s/gAP5vpEPV8a+dphOummr6G7deGQ4=";
};
nativeBuildInputs = [
pkgs/development/python-modules/faust-cchardet/default.nix
+47
View File
@@ -0,0 +1,47 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, cython
, pkgconfig
, setuptools
, wheel
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "faust-cchardet";
version = "2.1.18";
format = "pyproject";
src = fetchFromGitHub {
owner = "faust-streaming";
repo = "cChardet";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k=";
};
nativeBuildInputs = [
cython
pkgconfig
setuptools
wheel
];
pythonImportsCheck = [
"cchardet"
];
nativeCheckInputs = [
pytestCheckHook
];
meta = {
changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst";
description = "High-speed universal character encoding detector";
homepage = "https://github.com/faust-streaming/cChardet";
license = lib.licenses.mpl11;
maintainers = with lib.maintainers; [ dotlambda ivan ];
};
}
pkgs/development/python-modules/google-cloud-automl/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.10.1";
version = "2.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4=";
hash = "sha256-fc/87JW9FExvZPk+pHLuntLHfdj0kRi2e5ohRq5Ujpg=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/hassil/default.nix
+6 -19
View File
@@ -1,13 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
# build
, antlr4
, pythonOlder
# propagates
, antlr4-python3-runtime
, dataclasses-json
, importlib-resources
, pyyaml
# tests
@@ -16,7 +13,7 @@
let
pname = "hassil";
version = "0.2.6";
version = "1.0.6";
in
buildPythonPackage {
inherit pname version;
@@ -24,23 +21,13 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY=";
hash = "sha256-rCSVKFIkfPg2aYFwuYVLMxMO8S11dV8f4eckpFbNB3k=";
};
nativeBuildInputs = [
antlr4
];
postPatch = ''
sed -i 's/antlr4-python3-runtime==.*/antlr4-python3-runtime/' requirements.txt
rm hassil/grammar/*.{tokens,interp}
antlr -Dlanguage=Python3 -visitor -o hassil/grammar/ *.g4
'';
propagatedBuildInputs = [
antlr4-python3-runtime
dataclasses-json
pyyaml
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
nativeCheckInputs = [
pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
+3 -2
View File
@@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-clusters";
version = "2023.1.0";
version = "2023.2.2";
format = "wheel";
src = fetchPypi {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
pname = "home_assistant_chip_clusters";
dist = "py3";
python = "py3";
hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg=";
hash = "sha256-FsIE4dcZOP24/DX6TLnmoCHMYe4f9gWqmv2L25ujqu4=";
};
propagatedBuildInputs = [
@@ -30,6 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python-base APIs and tools for CHIP";
homepage = "https://github.com/home-assistant-libs/chip-wheels";
changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}";
license = licenses.asl20;
maintainers = teams.home-assistant.members;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
pkgs/development/python-modules/home-assistant-chip-core/default.nix
+3 -2
View File
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-core";
version = "2023.1.0";
version = "2023.2.2";
format = "wheel";
disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
};
"x86_64-linux" = {
name = "x86_64";
hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM=";
hash = "sha256-15olERnpfe4PbDsDfw47vsYsqjFe8P8IDmSSGxGLtx8=";
};
}.${stdenv.system} or (throw "Unsupported system");
in fetchPypi {
@@ -85,6 +85,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python-base APIs and tools for CHIP";
homepage = "https://github.com/home-assistant-libs/chip-wheels";
changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}";
license = licenses.asl20;
maintainers = teams.home-assistant.members;
platforms = [ "aarch64-linux" "x86_64-linux" ];
pkgs/development/python-modules/nettigo-air-monitor/default.nix
+3 -3
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "nettigo-air-monitor";
version = "1.6.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
hash = "sha256-86YEpn3rI6Y4v0pcNk+/4tHCUzXpXZN5xwV9M/1gZ8U=";
rev = "refs/tags/${version}";
hash = "sha256-6pLdaBeyTIrsAzkr83Iywta+K4Vx3nt0QyL8opHNwV8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/nibe/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nibe";
version = "1.6.0";
version = "2.0.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "yozik04";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-6pQsVGb26FpoV2LgOrs+Cfq2rATRqbljrVJ+NsZUSuc=";
hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw=";
};
nativeBuildInputs = [
pkgs/development/python-modules/nuheat/default.nix
+48
View File
@@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, parameterized
, pytestCheckHook
, pythonOlder
, requests
, responses
}:
buildPythonPackage rec {
pname = "nuheat";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "broox";
repo = "python-nuheat";
rev = "refs/tags/${version}";
hash = "sha256-EsPuwILfKc1Bpvu0Qos7yooC3dBaqf46lWhiSZdu3sc=";
};
propagatedBuildInputs = [
requests
];
nativeCheckInputs = [
mock
parameterized
pytestCheckHook
responses
];
pythonImportsCheck = [
"nuheat"
];
meta = with lib; {
description = "Library to interact with NuHeat Signature and Mapei Mapeheat radiant floor thermostats";
homepage = "https://github.com/broox/python-nuheat";
changelog = "https://github.com/broox/python-nuheat/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/pontos/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "23.2.12";
version = "23.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3SxgAFpES53AP9W/Q4cajOmgU8sZgK/LduG4psw2KP4=";
hash = "sha256-00vIdNiiUmvPevGAUAgaxo8tKICPbAt9byJrSySogPY=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pyairnow/default.nix
+3 -12
View File
@@ -3,7 +3,6 @@
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pytest-aiohttp
, poetry-core
, pytest-asyncio
@@ -13,24 +12,16 @@
buildPythonPackage rec {
pname = "pyairnow";
version = "1.1.0";
version = "1.2.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "asymworks";
repo = pname;
rev = "v${version}";
sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c";
rev = "refs/tags/v${version}";
hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk=";
};
patches = [
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/asymworks/pyairnow/commit/f7a01733a41c648563fc2fe4b559f61ef08b9153.patch";
hash = "sha256-lcHnFP3bwkPTi9Zq1dZtShLKyXcxO0XoDF+PgjbWOqs=";
})
];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ aiohttp ];
pkgs/development/python-modules/pybalboa/default.nix
+9 -4
View File
@@ -2,22 +2,27 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
}:
buildPythonPackage rec {
pname = "pybalboa";
version = "0.13";
format = "setuptools";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "garbled1";
repo = pname;
rev = version;
sha256 = "0aw5jxpsvzyx05y1mg8d63lxx1i607yb6x19n9jil5wfis95m8pd";
rev = "refs/tags/${version}";
hash = "sha256-08FMNRArzmfmLH6y5Z8QPcRVZJIvU3VIOvdTry3iBGI=";
};
nativeBuildInputs = [
poetry-core
];
# Project has no tests
doCheck = false;
pkgs/development/python-modules/pyinsteon/default.nix
+10 -13
View File
@@ -7,17 +7,16 @@
, pypubsub
, pyserial
, pyserial-asyncio
, pytest-asyncio
, pytest-timeout
, pytestCheckHook
, pythonOlder
, pyyaml
, setuptools
, voluptuous
}:
buildPythonPackage rec {
pname = "pyinsteon";
version = "1.2.0";
format = "setuptools";
version = "1.3.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -25,29 +24,27 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs=";
hash = "sha256-zbqgwCukTmvCIXpAvaKQl7voOI4ATqsT9NPUyRhw2EE=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiofiles
aiohttp
pypubsub
pyserial
pyserial-asyncio
pyyaml
voluptuous
];
nativeCheckInputs = [
async_generator
pytest-asyncio
pytest-timeout
pytestCheckHook
];
disabledTests = [
"test_results"
];
pythonImportsCheck = [
"pyinsteon"
];
pkgs/development/python-modules/pypykatz/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pypykatz";
version = "0.6.3";
version = "0.6.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Rb4QCxntXJYA8sqkgAjS6e8WJK9ljhIKgM3dfpmbHSc=";
hash = "sha256-1cHQ05yKofZC3pz8JIZCjZmZasqSb/SSwJlg8ThIn1k=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/python-decouple/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildPythonPackage rec {
pname = "python-decouple";
version = "3.7";
version = "3.8";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "HBNetwork";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sCUlE+92+nG7ZHuGKXRJVx2wokNP7/F7g8LvdRWqHCQ=";
hash = "sha256-F9Gu7Y/dJhwOJi/ZaoVclF3+4U/N5JdvpXwgGB3SF3Q=";
};
nativeCheckInputs = [
pkgs/development/python-modules/python-matter-server/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "python-matter-server";
version = "2.1.0";
version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU=";
hash = "sha256-nNf0Q3J5nrYDinMnl+p3HC4FYMX+GubYmtchfuATWms=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-otbr-api/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ lib
, aiohttp
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
, voluptuous
}:
buildPythonPackage rec {
pname = "python-otbr-api";
version = "1.0.5";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-yI7TzVJGSWdi+NKZ0CCOi3BC4WIqFuS7YZgihfWDBSY=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
cryptography
voluptuous
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"python_otbr_api"
];
meta = with lib; {
description = "Library for the Open Thread Border Router";
homepage = "https://github.com/home-assistant-libs/python-otbr-api";
changelog = "https://github.com/home-assistant-libs/python-otbr-api/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/syrupy/default.nix
+15 -4
View File
@@ -1,22 +1,25 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, poetry-core
, pytest
, colored
, pytestCheckHook
, invoke
}:
buildPythonPackage rec {
pname = "syrupy";
version = "3.0.6";
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.8.1";
src = fetchFromGitHub {
owner = "tophat";
repo = "syrupy";
rev = "refs/tags/v${version}";
hash = "sha256-8DdPgah1cWVY9YZT78otlAv7X00iwxfi+Fkn3OmLgeM=";
hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE=";
};
nativeBuildInputs = [
@@ -32,9 +35,17 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytestCheckHook
invoke
pytest
];
checkPhase = ''
runHook preCheck
# https://github.com/tophat/syrupy/blob/main/CONTRIBUTING.md#local-development
invoke test
runHook postCheck
'';
meta = with lib; {
changelog = "https://github.com/tophat/syrupy/releases/tag/v${version}";
description = "Pytest Snapshot Test Utility";
pkgs/development/python-modules/textual/default.nix
+5
View File
@@ -59,6 +59,11 @@ buildPythonPackage rec {
time-machine
];
disabledTestPaths = [
# snapshot tests require syrupy<4
"tests/snapshot_tests/test_snapshots.py"
];
pythonImportsCheck = [
"textual"
];
pkgs/development/python-modules/velbus-aio/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2022.12.0";
version = "2023.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
hash = "sha256-hhomNynH2X2tnCzVBmyF/sYsHLHyGGaR9oX6M7kcWVc=";
hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g=";
fetchSubmodules = true;
};
pkgs/development/python-modules/voluptuous-serialize/default.nix
+11 -6
View File
@@ -8,25 +8,30 @@
buildPythonPackage rec {
pname = "voluptuous-serialize";
version = "2.5.0";
version = "2.6.0";
format = "setuptools";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "sha256-8rWMz8tBanxHdU/F4HhBxxz3ltqbdRoP4JED2dmZfTk=";
repo = "voluptuous-serialize";
rev = "refs/tags/${version}";
hash = "sha256-vvreXSQDkA3JkZpOKZqJgMRyObJX/cSR8r+A26h9fNE=";
};
propagatedBuildInputs = [ voluptuous ];
propagatedBuildInputs = [
voluptuous
];
nativeCheckInputs = [
pytestCheckHook
voluptuous
];
pythonImportsCheck = [ "voluptuous_serialize" ];
pythonImportsCheck = [
"voluptuous_serialize"
];
meta = with lib; {
homepage = "https://github.com/home-assistant-libs/voluptuous-serialize";
pkgs/development/python-modules/vulcan-api/default.nix
+4 -4
View File
@@ -3,7 +3,7 @@
, aiodns
, aiohttp
, buildPythonPackage
, cchardet
, faust-cchardet
, fetchFromGitHub
, pyopenssl
, pythonOlder
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "vulcan-api";
version = "2.2.1";
version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,14 +25,14 @@ buildPythonPackage rec {
owner = "kapi2289";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ=";
hash = "sha256-5Tj611p4wYn7GjoCtCTRhUZkKyAJglHcci76ciVFWik=";
};
propagatedBuildInputs = [
aenum
aiodns
aiohttp
cchardet
faust-cchardet
pyopenssl
pytz
related
pkgs/development/python-modules/xknx/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "2.4.0";
version = "2.6.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-MSk/c2qLztq5GQ6+CzK0Jw+rOJTClguaoL284YaBPjw=";
hash = "sha256-ivqUego6a9ieSxgHKd3szVAE23zMI54nYqbZjHIgVVE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/yolink-api/default.nix
+12 -5
View File
@@ -2,15 +2,17 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, paho-mqtt
, asyncio-mqtt
, pydantic
, pythonOlder
, setuptools
, tenacity
}:
buildPythonPackage rec {
pname = "yolink-api";
version = "0.1.5";
format = "setuptools";
version = "0.2.8";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -18,13 +20,18 @@ buildPythonPackage rec {
owner = "YoSmart-Inc";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6Ch17aKUT8jVUo+pYD5EvydEzP/TTjLtgkUQJnHYkKg=";
hash = "sha256-dcuP2VPAp3Na1o9DV3bPejCrtaIxvt+g/vRaQYqI67Q=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
paho-mqtt
asyncio-mqtt
pydantic
tenacity
];
# Module has no tests
pkgs/development/python-modules/zeroconf/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.47.1";
version = "0.47.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = "refs/tags/${version}";
hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA=";
hash = "sha256-hpbJ7kcyM8S2xAaVjuPzHXl/gcAYk3CX7NHxsbZXQ10=";
};
nativeBuildInputs = [
pkgs/development/python-modules/zigpy-znp/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy-znp";
version = "0.9.2";
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-orJDOnkZH9siDg8H8M8C0UTxJfWPTB+gBNtUM6s4F94=";
sha256 = "sha256-UTL7g9tIXtMVeBRq5Fdw5VqUB9H/LaobASwHlFPoO2s=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/zwave-js-server-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.44.0";
version = "0.46.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4=";
hash = "sha256-EeQ0gUSDsHIJnp1Oc2Imld4ZFa5maX8xj6GzchHlCoc=";
};
propagatedBuildInputs = [
pkgs/development/tools/analysis/bingrep/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bingrep";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "m4b";
repo = pname;
rev = "v${version}";
hash = "sha256-Uzkz4KEFOf4XdcfkjQm8OQRenUX9jDxTJaRivfIy0ak=";
hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8=";
};
cargoHash = "sha256-NbZ9E3vUiDDKyEHZfgS8ErxXhQSTTsoPA/g+kGxCbXc=";
cargoHash = "sha256-n49VmAJcD98LdkrUCW6ouihSXmSCsdBDvCe9l96G0ec=";
meta = with lib; {
description = "Greps through binaries from various OSs and architectures, and colors them";
pkgs/development/tools/dockfmt/default.nix
+6 -5
View File
@@ -5,13 +5,14 @@
buildGoModule rec {
pname = "dockfmt";
version = "0.3.3";
version = "unstable-2020-09-18";
# The latest released version doesn't support reading from stdin.
src = fetchFromGitHub {
owner = "jessfraz";
repo = "dockfmt";
rev = "v${version}";
sha256 = "0m56ydmf7zbcsa5yym7j5fgr75v677h9s40zyzwrqccyq01myp06";
rev = "1455059b8bb53ab4723ef41946c43160583a8333";
hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg=";
};
vendorSha256 = null;
@@ -25,7 +26,7 @@ buildGoModule rec {
meta = with lib; {
description = "Dockerfile format";
homepage = "https://github.com/jessfraz/dockfmt";
license = [ licenses.mit ];
maintainers = [ maintainers.cpcloud ];
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
}
pkgs/development/tools/gomplate/default.nix
+12 -9
View File
@@ -1,18 +1,20 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "gomplate";
version = "3.11.3";
owner = "hairyhenderson";
rev = "v${version}";
version = "3.11.4";
src = fetchFromGitHub {
inherit owner rev;
owner = "hairyhenderson";
repo = pname;
sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw=";
rev = "refs/tags/v${version}";
hash = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4=";
};
vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc=";
vendorHash = "sha256-X3o00WATVlWoc1Axug5ErPtLDQ+BL3CtO/QyNtavIpg=";
postPatch = ''
# some tests require network access
@@ -32,13 +34,14 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/${owner}/${pname}/v3/version.Version=${rev}"
"-X github.com/${src.owner}/${pname}/v3/version.Version=${version}"
];
meta = with lib; {
description = "A flexible commandline tool for template rendering";
homepage = "https://gomplate.ca/";
maintainers = with maintainers; [ ris jlesquembre ];
changelog = "https://github.com/hairyhenderson/gomplate/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ris jlesquembre ];
};
}
pkgs/development/tools/micronaut/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "micronaut";
version = "3.8.5";
version = "3.8.6";
src = fetchzip {
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
sha256 = "sha256-u7Hwj/RYE8pZkIVulJrwdC1kxhTGl3P5DEug6v5lMvg=";
sha256 = "sha256-hnECB/tqyEN0g3WIIEHg2uAzEmspB+TQUTECyOtUNy4=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
pkgs/development/tools/misc/patchelf/patches/380.patch
-90
View File
@@ -1,90 +0,0 @@
From 8db45c6a0c1a4dbbd492ac7fb59c1bca9460fe3e Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 18 Jun 2022 21:45:22 -0700
Subject: [PATCH 1/3] elf.h: resynchronize with glibc elf.h
This commit adds two symbols (SHT_MIPS_XHASH and DT_MIPS_XHASH) found
in glibc, and updates the value of DT_MIPS_NUM. These changes were
made to glibc in 23c1c256ae7b0f010d0fcaff60682b620887b164 on
29-Aug-2019.
---
src/elf.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/elf.h b/src/elf.h
index b3e567c3..702f2e60 100644
--- a/src/elf.h
+++ b/src/elf.h
@@ -1400,6 +1400,7 @@ typedef struct
#define SHT_MIPS_EH_REGION 0x70000027
#define SHT_MIPS_XLATE_OLD 0x70000028
#define SHT_MIPS_PDR_EXCEPTION 0x70000029
+#define SHT_MIPS_XHASH 0x7000002b
/* Legal values for sh_flags field of Elf32_Shdr. */
@@ -1647,7 +1648,9 @@ typedef struct
in a PIE as it stores a relative offset from the address of the tag
rather than an absolute address. */
#define DT_MIPS_RLD_MAP_REL 0x70000035
-#define DT_MIPS_NUM 0x36
+/* GNU-style hash table with xlat. */
+#define DT_MIPS_XHASH 0x70000036
+#define DT_MIPS_NUM 0x37
/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */
From 820da7be8d1e1a49c4831dcb3800ed3b9f11e8a6 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 18 Jun 2022 21:49:14 -0700
Subject: [PATCH 2/3] patchelf.cc: handle DT_MIPS_XHASH and .MIPS.xhash
glibc changed their ABI in commit
23c1c256ae7b0f010d0fcaff60682b620887b164 on 2019-Aug-29, by changing
the structure of the .gnu.hash data on MIPS and moving it to a
different section. We need to adapt to this change by glibc.
Closes #368
---
src/patchelf.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/patchelf.cc b/src/patchelf.cc
index 6882b288..08585139 100644
--- a/src/patchelf.cc
+++ b/src/patchelf.cc
@@ -990,6 +990,10 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress)
// some binaries might this section stripped
// in which case we just ignore the value.
if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr;
+ } else if (d_tag == DT_MIPS_XHASH) {
+ // the .MIPS.xhash section was added to the glibc-ABI
+ // in commit 23c1c256ae7b0f010d0fcaff60682b620887b164
+ dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr;
} else if (d_tag == DT_JMPREL) {
auto shdr = tryFindSectionHeader(".rel.plt");
if (!shdr) shdr = tryFindSectionHeader(".rela.plt");
From 7b155fda3105ceca5643cacbdd4207c4c4c59cf5 Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Sat, 18 Jun 2022 22:44:04 -0700
Subject: [PATCH 3/3] formatting: fix incorrect indentation in previous commit
---
src/patchelf.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/patchelf.cc b/src/patchelf.cc
index 08585139..402b2bed 100644
--- a/src/patchelf.cc
+++ b/src/patchelf.cc
@@ -990,7 +990,7 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress)
// some binaries might this section stripped
// in which case we just ignore the value.
if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr;
- } else if (d_tag == DT_MIPS_XHASH) {
+ } else if (d_tag == DT_MIPS_XHASH) {
// the .MIPS.xhash section was added to the glibc-ABI
// in commit 23c1c256ae7b0f010d0fcaff60682b620887b164
dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr;
pkgs/servers/home-assistant/component-packages.nix
+50 -148
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.2.5";
version = "2023.3.0";
components = {
"3_day_blinds" = ps: with ps; [
];
@@ -70,10 +70,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -200,10 +197,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -355,10 +349,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -378,9 +369,6 @@
bluetooth-data-tools
dbus-fast
fnvhash
home-assistant-frontend
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -398,10 +386,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -420,10 +405,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -492,10 +474,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -811,6 +790,25 @@
];
"dooya" = ps: with ps; [
];
"dormakaba_dkey" = ps: with ps; [
aioesphomeapi
aiohttp-cors
aioruuvigateway
aioshelly
bleak-retry-connector
bleak
bluetooth-adapters
bluetooth-auto-recovery
bluetooth-data-tools
dbus-fast
esphome-dashboard-api
fnvhash
ifaddr
pyserial
pyudev
sqlalchemy
zeroconf
]; # missing inputs: py-dormakaba-dkey
"dovado" = ps: with ps; [
]; # missing inputs: dovado
"downloader" = ps: with ps; [
@@ -843,6 +841,8 @@
"eafm" = ps: with ps; [
aioeafm
];
"easyenergy" = ps: with ps; [
]; # missing inputs: easyenergy
"ebox" = ps: with ps; [
]; # missing inputs: pyebox
"ebusd" = ps: with ps; [
@@ -974,10 +974,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -997,10 +994,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1023,10 +1017,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1074,7 +1065,7 @@
ha-ffmpeg
];
"fibaro" = ps: with ps; [
fiblary3-fork
pyfibaro
];
"fido" = ps: with ps; [
pyfido
@@ -1127,10 +1118,7 @@
esphome-dashboard-api
fjaraskupan
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1376,10 +1364,7 @@
esphome-dashboard-api
fnvhash
govee-ble
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1423,12 +1408,7 @@
];
"hardkernel" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
psutil-home-assistant
sqlalchemy
];
"hardware" = ps: with ps; [
psutil-home-assistant
@@ -1441,11 +1421,6 @@
];
"hassio" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
sqlalchemy
];
"havana_shade" = ps: with ps; [
];
@@ -1514,15 +1489,12 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial-asyncio
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@@ -1534,8 +1506,6 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
psutil-home-assistant
@@ -1543,7 +1513,6 @@
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@@ -1555,8 +1524,6 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
psutil-home-assistant
@@ -1564,7 +1531,6 @@
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@@ -1598,11 +1564,10 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyroute2
pyserial
python-otbr-api
pyudev
sqlalchemy
zeroconf
@@ -1683,11 +1648,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ibeacon-ble
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1744,11 +1706,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
inkbird-ble
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1877,11 +1836,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
kegtron-ble
pillow
pyserial
pyudev
sqlalchemy
@@ -1907,10 +1863,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -1930,6 +1883,8 @@
pykmtronic
];
"knx" = ps: with ps; [
aiohttp-cors
janus
xknx
];
"kodi" = ps: with ps; [
@@ -1999,10 +1954,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -2021,11 +1973,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
led-ble
pillow
pyserial
pyudev
sqlalchemy
@@ -2233,10 +2182,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -2320,11 +2266,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
moat-ble
pillow
pyserial
pyudev
sqlalchemy
@@ -2378,15 +2321,13 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
mopeka-iot-ble
pyserial
pyudev
sqlalchemy
zeroconf
]; # missing inputs: mopeka_iot_ble
];
"motion_blinds" = ps: with ps; [
aiohttp-cors
fnvhash
@@ -2593,7 +2534,8 @@
aio-geojson-nsw-rfs-incidents
];
"nuheat" = ps: with ps; [
]; # missing inputs: nuheat
nuheat
];
"nuki" = ps: with ps; [
pynuki
];
@@ -2638,8 +2580,6 @@
"onboarding" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
sqlalchemy
];
@@ -2725,11 +2665,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
oralb-ble
pillow
pyserial
pyudev
sqlalchemy
@@ -2745,11 +2682,12 @@
"otbr" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
ifaddr
pyroute2
python-otbr-api
sqlalchemy
]; # missing inputs: python-otbr-api
zeroconf
];
"otp" = ps: with ps; [
pyotp
];
@@ -2940,10 +2878,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
qingping-ble
@@ -3004,12 +2939,7 @@
];
"raspberry_pi" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
psutil-home-assistant
sqlalchemy
];
"raspyrfm" = ps: with ps; [
]; # missing inputs: raspyrfm-client
@@ -3139,9 +3069,6 @@
bluetooth-data-tools
dbus-fast
fnvhash
home-assistant-frontend
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3159,10 +3086,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
ruuvitag-ble
@@ -3260,10 +3184,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3288,10 +3209,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sensorpro-ble
@@ -3311,10 +3229,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sensorpush-ble
@@ -3362,9 +3277,6 @@
bluetooth-data-tools
dbus-fast
fnvhash
home-assistant-frontend
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3490,10 +3402,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pysnooz
pyudev
@@ -3673,10 +3582,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3798,10 +3704,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3823,10 +3726,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3845,6 +3745,13 @@
"thomson" = ps: with ps; [
];
"thread" = ps: with ps; [
aiohttp-cors
fnvhash
ifaddr
pyroute2
python-otbr-api
sqlalchemy
zeroconf
];
"threshold" = ps: with ps; [
];
@@ -3871,10 +3778,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -3924,6 +3828,9 @@
];
"tplink_lte" = ps: with ps; [
]; # missing inputs: tp-connected
"tplink_omada" = ps: with ps; [
tplink-omada-client
];
"traccar" = ps: with ps; [
aiohttp-cors
pytraccar
@@ -4264,10 +4171,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -4303,10 +4207,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@@ -4382,15 +4283,12 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial-asyncio
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@@ -4804,6 +4702,7 @@
"modern_forms"
"mold_indicator"
"moon"
"mopeka"
"motion_blinds"
"motioneye"
"mqtt"
@@ -4839,6 +4738,7 @@
"notify_events"
"notion"
"nsw_rural_fire_service_feed"
"nuheat"
"nuki"
"number"
"nut"
@@ -4863,6 +4763,7 @@
"openweathermap"
"opnsense"
"oralb"
"otbr"
"overkiz"
"ovo_energy"
"owntracks"
@@ -5053,6 +4954,7 @@
"toon"
"totalconnect"
"tplink"
"tplink_omada"
"traccar"
"trace"
"tractive"
pkgs/servers/home-assistant/default.nix
+34 -24
View File
@@ -2,6 +2,7 @@
, lib
, callPackage
, fetchFromGitHub
, fetchPypi
, fetchpatch
, python3
, substituteAll
@@ -42,16 +43,6 @@ let
};
});
# https://github.com/postlund/pyatv/issues/1879
aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
pname = "aiohttp";
version = "3.8.1";
src = self.fetchPypi {
inherit pname version;
hash = "sha256-/FRx4aVN4V73HBvG6+gNTcaB6mAOaL/Ry85AQn8LdXg=";
};
});
aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec {
version = "0.1.1";
src = fetchFromGitHub {
@@ -88,16 +79,6 @@ let
};
});
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
version = "4.0.0";
src = fetchFromGitHub {
owner = "klaasnicolaas";
repo = "python-gridnet";
rev = "refs/tags/v${version}";
hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk=";
};
});
# Pinned due to API changes in 10.0
mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec {
version = "9.3.0";
@@ -199,6 +180,22 @@ let
doCheck = false;
});
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "2.0.4";
src = super.fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-laGOGmryEU29nuTxaK0zBw1jF+Ebr6KNmDzHtYX+kAs=";
};
nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [
pytest-xdist
]);
disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [
"test/aaa_profiling"
"test/ext/mypy"
];
});
# Pinned due to API changes in 0.3.0
tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
version = "0.2.0";
@@ -266,7 +263,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.2.5";
hassVersion = "2023.3.0";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -279,18 +276,30 @@ in python.pkgs.buildPythonApplication rec {
# don't try and fail to strip 6600+ python files, it takes minutes!
dontStrip = true;
# PyPI tarball is missing tests/ directory
src = fetchFromGitHub {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-JxTvAUKZj59jL1czTBzPD7+6x1K7xGGGwZAO8f8dkzg=";
};
# Secondary source is git for tests
gitSrc = fetchFromGitHub {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys=";
hash = "sha256-azH9CnHIY0iOLaF3Iqy+uJ6TuftUs1j4RcpXyRQrQws=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools
];
# copy tests early, so patches apply as they would to the git repo
prePatch = ''
cp --no-preserve=mode --recursive ${gitSrc}/tests ./
chmod u+x tests/auth/providers/test_command_line_cmd.sh
'';
# leave this in, so users don't have to constantly update their downstream patch handling
patches = [
(substituteAll {
@@ -378,6 +387,7 @@ in python.pkgs.buildPythonApplication rec {
requests-mock
respx
stdlib-list
syrupy
tomli
# required through tests/auth/mfa_modules/test_otp.py
pyotp
pkgs/servers/home-assistant/frontend.nix
+2 -2
View File
@@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20230202.0";
version = "20230301.0";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-Wo3bQnwTDSAC4EhJeYIXx1wODyx3wA2KMMaM3pJEkGw=";
hash = "sha256-2hxP2Wyjkvlje/RnZBtou3Y81d16SYBeAm+JX8hWct4=";
};
# there is nothing to strip in this package
pkgs/servers/home-assistant/intents.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "home-assistant-intents";
version = "2023.1.31";
version = "2023.2.28";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "home-assistant";
repo = "intents";
rev = "refs/tags/${version}";
hash = "sha256-buq/SLXDFP0xvIb2yGiHQzuL7HKvc7bxxdkhq4KHpvM=";
hash = "sha256-u9CLPikht+T9wdQpLELPH/t+pZNcaOfbtfWT6DBwZaw=";
};
sourceRoot = "source/package";
pkgs/servers/home-assistant/patches/ffmpeg-path.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py
index 74c826f47d..91f359da2a 100644
index a98766c78c..1c47bb1f80 100644
--- a/homeassistant/components/ffmpeg/__init__.py
+++ b/homeassistant/components/ffmpeg/__init__.py
@@ -40,7 +40,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin"
@@ -41,7 +41,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin"
CONF_EXTRA_ARGUMENTS = "extra_arguments"
CONF_OUTPUT = "output"
@@ -12,7 +12,7 @@ index 74c826f47d..91f359da2a 100644
CONFIG_SCHEMA = vol.Schema(
{
diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py
index e1730ffdab..e9cd7934fd 100644
index 521ac732e5..ab8a56934f 100644
--- a/tests/components/ffmpeg/test_init.py
+++ b/tests/components/ffmpeg/test_init.py
@@ -87,7 +87,7 @@ class TestFFmpegSetup:
pkgs/servers/home-assistant/stubs.nix
+5 -2
View File
@@ -3,18 +3,21 @@
, fetchFromGitHub
, poetry-core
, home-assistant
, python
}:
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.2.5";
version = "2023.3.0";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
src = fetchFromGitHub {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-MQYk4DWvmqtPl00L1c00JclKkTZe9EYMrm/LucUHBE0=";
hash = "sha256-svFp3MYj+DIwCT9+/G+lYPRwxGMtJbJQuBD5e+5r0Z4=";
};
nativeBuildInputs = [
pkgs/servers/home-assistant/tests.nix
+6 -1
View File
@@ -19,8 +19,10 @@ let
homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ];
homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
lovelace = [ PyChromecast ];
mopeka = [ pyswitchbot ];
nest = [ av ];
onboarding = [ pymetno radios rpi-bad-power ];
otbr = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
raspberry_pi = [ rpi-bad-power ];
shelly = [ pyswitchbot ];
tilt_ble = [ govee-ble ibeacon-ble ];
@@ -55,6 +57,9 @@ let
logbook = [
"--deselect tests/components/logbook/test_websocket_api.py::test_recorder_is_far_behind "
];
modbus = [
"--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail"
];
modem_callerid = [
# aioserial mock produces wrong state
"--deselect tests/components/modem_callerid/test_init.py::test_setup_entry"
@@ -83,7 +88,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
dontUsePytestXdist = true;
pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray
++ [ "--numprocesses=4" ]
++ [ "--numprocesses=2" ]
++ extraPytestFlagsArray.${component} or [ ]
++ [ "tests/components/${component}" ];
pkgs/tools/admin/chamber/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chamber";
version = "2.11.1";
version = "2.12.0";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0SiHJ86fW4QahIBfcFD7FJONbN4ImYyF7yqw3URmcd8=";
sha256 = "sha256-asNzvHpDqKuLPy+TgjaiCZ96A/dy6em5EGmVRvyd1YU=";
};
CGO_ENABLED = 0;
pkgs/tools/admin/cli53/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cli53";
version = "0.8.21";
version = "0.8.22";
src = fetchFromGitHub {
owner = "barnybug";
repo = "cli53";
rev = version;
sha256 = "sha256-N7FZfc3kxbMY2ooj+ztlj6xILF3gzT60Yb/puWg58V4=";
sha256 = "sha256-wfb3lK/WB/B8gd4BOqh+Ol10cNZdsoCoQ+hM33+goM8=";
};
vendorHash = "sha256-LKJXoXZS866UfJ+Edwf6AkAZmTV2Q1OI1mZfbsxHb3s=";
pkgs/tools/misc/tailspin/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "tailspin";
version = "0.1";
version = "0.1.1";
src = fetchFromGitHub {
owner = "bensadeh";
repo = pname;
rev = version;
sha256 = "sha256-ReWgbAmEGpNOv6QArNT+eWaty88tChhH1nhH0vZe2/E=";
sha256 = "sha256-f9VfOcLOWJ4yr/CS0lqaqiaTfzOgdoI9CaS70AMNdsc=";
};
vendorSha256 = "sha256-rZJO/TSGrYwrtIKQpKhZZqnXY6IHNyjS26vBDv/iQ34=";
vendorHash = "sha256-gn7/pFw7JEhkkd/PBP4jLUKb5NBaRE/rb049Ic/Bu7A=";
CGO_ENABLED = 0;
pkgs/tools/security/asnmap/default.nix
+5 -4
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "asnmap";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
hash = "sha256-AndX0PISGKhVmUFcJ2pCu8dqH67nVCe+25MIcF9d+8A=";
rev = "refs/tags/v${version}";
hash = "sha256-auVdBt8XT0qvEC9TfuROBbV/D6uQXBODZs/vrkJolwI=";
};
vendorHash = "sha256-+a6GgKHQ1D/hW9MEutyfbNbyDJuQGJ7Vd9Pz6w08lfo=";
vendorHash = "sha256-6z40pIj6cgC7lXS2qDhkYec5zIrmjHzh2W0U5BDmSzU=";
# Tests require network access
doCheck = false;
@@ -22,6 +22,7 @@ buildGoModule rec {
meta = with lib; {
description = "Tool to gather network ranges using ASN information";
homepage = "https://github.com/projectdiscovery/asnmap";
changelog = "https://github.com/projectdiscovery/asnmap/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/tools/security/grype/default.nix
+3 -3
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "grype";
version = "0.57.1";
version = "0.58.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
hash = "sha256-NACasOoCABoHmb4U5LvQ8EPO7G10A7uQtX4th/WJqrw=";
hash = "sha256-7yb6ufRoAB70hnoBv6ZwEtKeTJxxmWEknksCmM55eYE=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -28,7 +28,7 @@ buildGoModule rec {
};
proxyVendor = true;
vendorHash = "sha256-DLY0tcacGFcP17IqUVvpVkUjd2xQMO5JZxltmL4b+Wo=";
vendorHash = "sha256-7i9/tufEUGVqNHP61pQuIK2tMdiBcs3vfFz1bzlHFKk=";
nativeBuildInputs = [
installShellFiles
pkgs/tools/security/saml2aws/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "saml2aws";
version = "2.36.3";
version = "2.36.4";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
sha256 = "sha256-xNOID8/xdC4vkq8TAocvBVu2jVMDwioFBqlmFcMmMII=";
sha256 = "sha256-bUXiF+GlmNe8zoEjC8aWsbKEnymUKQv+121dTUVtqEQ=";
};
vendorHash = "sha256-APwtLd8+Imy4cBSlm4sHPdA/DQCN4pDFSM/R5ib3k4E=";
pkgs/tools/security/trufflehog/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.28.5";
version = "3.28.6";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-KpfqB9l5ZEZQ1Ino2iuQVl79r2VWNWP42GA14tkKnoo=";
hash = "sha256-CzZRkEQ3FANzg7QZi5r/AT4DurKo3M4V/ghxGvJas7s=";
};
vendorHash = "sha256-d8xc7yCyG1xfno/8ANe5eu7irP2yKDY2LKs3XdlktQk=";
vendorHash = "sha256-/4xZjqstrjfIlD15x2INSunb57WGR7NzKaQxUABxQV0=";
# Test cases run git clone and require network access
doCheck = false;
pkgs/tools/text/gucci/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gucci";
version = "1.6.5";
version = "1.6.6";
src = fetchFromGitHub {
owner = "noqcks";
repo = "gucci";
rev = "refs/tags/${version}";
sha256 = "sha256-x4qCdw+hw1cZ9NY+9eEHksBn+6K0v3QZ1fuT9PX75pc=";
sha256 = "sha256-0ZVRjzU/KTqhaQC6zubbcNp1jX2pgFSGyyIYcWaHzeU=";
};
vendorSha256 = "sha256-YSAzbilyLip3cbnfVGlbHTW5cxmJyw/FYdYHXAqet+Q=";
vendorHash = "sha256-/4OnbtxxhXQnmSV6UbjgzXdL7szhL9rKiG5BR8FsyqI=";
ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ];
pkgs/tools/text/mdbook-katex/default.nix
+3 -3
View File
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-katex";
version = "0.3.8";
version = "0.3.9";
src = fetchCrate {
inherit pname version;
hash = "sha256-LeI46x5M2ZYUOIxuj9bCNwwucRLvoOkdRhsowmVxS68=";
hash = "sha256-FsKHGw/6n/8eCJh1XatNsw3iCzD+siHdJ3i0dNKD5Go=";
};
cargoHash = "sha256-pEwPnE2EpS+0bw3/SSKOCy8R5xUiG6mBMoup6wbrf+0=";
cargoHash = "sha256-nyLWbwruzQeyPGkVuMiRCTHtFE+E9nQ57ZMXxqIcLxE=";
OPENSSL_DIR = "${lib.getDev openssl}";
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
pkgs/top-level/python-packages.nix
+6
View File
@@ -3327,6 +3327,8 @@ self: super: with self; {
fasttext-predict = callPackage ../development/python-modules/fasttext-predict { };
faust-cchardet = callPackage ../development/python-modules/faust-cchardet { };
favicon = callPackage ../development/python-modules/favicon { };
fb-re2 = callPackage ../development/python-modules/fb-re2 { };
@@ -6534,6 +6536,8 @@ self: super: with self; {
Nuitka = callPackage ../development/python-modules/nuitka { };
nuheat = callPackage ../development/python-modules/nuheat { };
nulltype = callPackage ../development/python-modules/nulltype { };
num2words = callPackage ../development/python-modules/num2words { };
@@ -7391,6 +7395,8 @@ self: super: with self; {
python-memcached = callPackage ../development/python-modules/python-memcached { };
python-otbr-api = callPackage ../development/python-modules/python-otbr-api { };
python-openems = callPackage ../development/python-modules/python-openems { };
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };