ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 11:00:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging-next' into staging

Browse Source
This commit is contained in:
Martin Weinelt 2023-03-03 04:46:31 +01:00
commit 0580d85143
103 changed files with 2088 additions and 1909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nixos/modules/services/misc/gitea.nix
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";
@ -597,7 +597,7 @@ in
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @setuid @swap";
SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap";
};
environment = {
@ -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 ];
}

2
nixos/tests/atuin.nix
View File

@ -54,7 +54,7 @@ with lib;
client.execute("echo 'sync_address = \"http://server:${toString testPort}\"' > ~/.config/atuin/config.toml")
# log in to atuin server on client node
client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k {key}")
client.succeed(f"${atuin}/bin/atuin login -u ${testUser} -p ${testPass} -k \"{key}\"")
# pull records from atuin server
client.succeed("${atuin}/bin/atuin sync -f")

25
nixos/tests/gitea.nix
View File

@ -8,6 +8,21 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
## gpg --faked-system-time='20230301T010000!' --quick-generate-key snakeoil ed25519 sign
signingPrivateKey = ''
-----BEGIN PGP PRIVATE KEY BLOCK-----
lFgEY/6jkBYJKwYBBAHaRw8BAQdADXiZRV8RJUyC9g0LH04wLMaJL9WTc+szbMi7
5fw4yP8AAQCl8EwGfzSLm/P6fCBfA3I9znFb3MEHGCCJhJ6VtKYyRw7ktAhzbmFr
ZW9pbIiUBBMWCgA8FiEE+wUM6VW/NLtAdSixTWQt6LZ4x50FAmP+o5ACGwMFCQPC
ZwAECwkIBwQVCgkIBRYCAwEAAh4FAheAAAoJEE1kLei2eMedFTgBAKQs1oGFZrCI
TZP42hmBTKxGAI1wg7VSdDEWTZxut/2JAQDGgo2sa4VHMfj0aqYGxrIwfP2B7JHO
GCqGCRf9O/hzBA==
=9Uy3
-----END PGP PRIVATE KEY BLOCK-----
'';
signingPrivateKeyId = "4D642DE8B678C79D";
supportedDbTypes = [ "mysql" "postgres" "sqlite3" ];
makeGiteaTest = type: nameValuePair type (makeTest {
name = "${giteaPackage.pname}-${type}";
@ -21,8 +36,9 @@ let
database = { inherit type; };
package = giteaPackage;
settings.service.DISABLE_REGISTRATION = true;
settings."repository.signing".SIGNING_KEY = signingPrivateKeyId;
};
environment.systemPackages = [ giteaPackage pkgs.jq ];
environment.systemPackages = [ giteaPackage pkgs.gnupg pkgs.jq ];
services.openssh.enable = true;
};
client1 = { config, pkgs, ... }: {
@ -58,6 +74,13 @@ let
server.wait_for_open_port(3000)
server.succeed("curl --fail http://localhost:3000/")
server.succeed(
"su -l gitea -c 'gpg --homedir /var/lib/gitea/data/home/.gnupg "
+ "--import ${toString (pkgs.writeText "gitea.key" signingPrivateKey)}'"
)
assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg")
server.succeed(
"curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. "
+ "Please contact your site administrator.'"

4
pkgs/applications/editors/vim/common.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "9.0.1275";
version = "9.0.1369";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
hash = "sha256-WDnlYi9o2Kv/f3Fh1MHcfTlBTe1fxw4UyKJlKY04fyA=";
hash = "sha256-2YjWd07RMyiITnuI3/L0D9MiAxl2+9QVT1nrMBA9/dI=";
};
enableParallelBuilding = true;

12
pkgs/applications/editors/vscode/vscode.nix
View File

@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h";
x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0";
aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5";
aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x";
armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx";
x86_64-linux = "00n7mykr8dyn9chiwsp0s8pk53c39by4wl0hyx1inb0zqxaszw25";
x86_64-darwin = "1q41x23jbpisbwcxgmx18g0bcdsj5g1w3pbj9m6mxlssvbc2xiw6";
aarch64-linux = "1kaj8g50m8imk34whf6sq41a2b1751mjqxvpwnprlx0i7xj2l832";
aarch64-darwin = "1h6plmyv3xkkbpwka5rrkc1bdrgj9d8jp0q6qyhch368x8mp781m";
armv7l-linux = "0q46nzhn8agsif9s50dbdbx6ds3ll39yp5lrp9n7y9a26m4cwjmv";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.75.1";
version = "1.76.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";

41
pkgs/applications/emulators/dosbox-staging/default.nix
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

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.2/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.3/src -A '*.tar.xz' )

1872
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/misc/oxker/default.nix
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";

18
pkgs/applications/networking/browsers/misc/widevine-cdm.nix
View File

@ -1,18 +1,26 @@
{ lib, stdenv, fetchzip
{ lib
, stdenv
, fetchzip
}:
stdenv.mkDerivation rec {
pname = "widevine-cdm";
version = "4.10.2449.0";
version = "4.10.2557.0";
src = fetchzip {
url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE=";
hash = "sha256-XxTjuPjWy06SmHC6GaIVIp3zD76isCVATWwwdZljntE=";
stripRoot = false;
};
installPhase = ''
install -vD libwidevinecdm.so $out/libwidevinecdm.so
runHook preInstall
install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json
install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt
install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
runHook postInstall
'';
meta = with lib; {
@ -21,6 +29,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ jlamur ];
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" ];
};
}

2
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -144,7 +144,7 @@ buildPythonApplication {
--add-flags '--backend ${backend}'
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''}
${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
)
'';

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -11,7 +11,7 @@
, wayland, pipewire
, isSnapshot ? false
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
, enableWidevine ? false, vivaldi-widevine ? null
, enableWidevine ? false, widevine-cdm ? null
, commandLineArgs ? ""
, pulseSupport ? stdenv.isLinux, libpulseaudio
}:
@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
'' + lib.optionalString enableWidevine ''
ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
'' + ''
runHook postInstall
'';

28
pkgs/applications/networking/browsers/vivaldi/widevine.nix
View File

@ -1,28 +0,0 @@
{ lib, stdenv, fetchzip
}:
stdenv.mkDerivation rec {
pname = "widevine";
version = "4.10.2449.0";
src = fetchzip {
url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE=";
stripRoot = false;
};
installPhase = ''
install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json
install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt
install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
'';
meta = with lib; {
description = "Widevine support for Vivaldi";
homepage = "https://www.widevine.com";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ betaboon ];
platforms = [ "x86_64-linux" ];
};
}

29
pkgs/applications/networking/cluster/lens/darwin.nix Normal file
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" ];
};
}

48
pkgs/applications/networking/cluster/lens/default.nix
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 { }

44
pkgs/applications/networking/cluster/lens/linux.nix Normal file
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" ];
};
}

4
pkgs/applications/networking/instant-messengers/dino/default.nix
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 = ''

6
pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
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 = [

4
pkgs/applications/networking/mullvad-vpn/default.nix
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 = [

22
pkgs/applications/networking/mullvad/mullvad.nix
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

6
pkgs/applications/office/trilium/desktop.nix
View File

@ -6,13 +6,13 @@
let
pname = "trilium-desktop";
version = "0.58.8";
version = "0.59.1";
linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i";
linuxSource.sha256 = "04jmpz8riz71vzs13yy0prwfq3sji36n7mgap80q2xwx445bxrka";
darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q";
darwinSource.sha256 = "014phlv5mkn5pzbr9gwgy87d57wnkxa6g0pi3k2d4d29fj9v1f44";
meta = metaCommon // {
mainProgram = "trilium";

4
pkgs/applications/office/trilium/server.nix
View File

@ -3,8 +3,8 @@
let
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv";
version = "0.58.8";
serverSource.sha256 = "073hxqszd6sh2fcczs8c1sgby0pg97d3h99rjdrj7y2j85hflp5a";
version = "0.59.1";
in stdenv.mkDerivation rec {
pname = "trilium-server";
inherit version;

78
pkgs/applications/virtualization/looking-glass-client/default.nix
View File

@ -1,7 +1,39 @@
{ stdenv, lib, fetchFromGitHub, makeDesktopItem, cmake, pkg-config
, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig, libffi, expat
, libxkbcommon, libGL, libXext, libXrandr, libXi, libXScrnSaver, libXinerama
, libXcursor, libXpresent, wayland, wayland-protocols
{ stdenv
, lib
, fetchFromGitHub
, makeDesktopItem
, pkg-config
, cmake
, freefont_ttf
, spice-protocol
, nettle
, libbfd
, fontconfig
, libffi
, expat
, libGL
, libX11
, libxkbcommon
, libXext
, libXrandr
, libXi
, libXScrnSaver
, libXinerama
, libXcursor
, libXpresent
, wayland
, wayland-protocols
, pipewire
, pulseaudio
, libsamplerate
, xorgSupport ? true
, waylandSupport ? true
, pipewireSupport ? true
, pulseSupport ? true
}:
let
@ -16,40 +48,30 @@ let
in
stdenv.mkDerivation rec {
pname = "looking-glass-client";
version = "B5.0.1";
version = "B6";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "sha256-UzZQU5SzJ2mo9QBweQB0VJSnKfzgTG5QaKpIQN/6LCE=";
sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
libGL
freefont_ttf
spice-protocol
expat
libbfd
nettle
fontconfig
libffi
libxkbcommon
libXi
libXScrnSaver
libXinerama
libXcursor
libXpresent
libXext
libXrandr
wayland
wayland-protocols
];
buildInputs = [ libGL libX11 freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ]
++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr ]
++ lib.optionals waylandSupport [ libxkbcommon wayland wayland-protocols ]
++ lib.optionals pipewireSupport [ pipewire libsamplerate ]
++ lib.optionals pulseSupport [ pulseaudio libsamplerate ];
cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]
++ lib.optional (!xorgSupport) "-DENABLE_X11=no"
++ lib.optional (!waylandSupport) "-DENABLE_WAYLAND=no"
++ lib.optional (!pulseSupport) "-DENABLE_PULSEAUDIO=no"
++ lib.optional (!pipewireSupport) "-DENABLE_PIPEWIRE=no";
cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ];
postUnpack = ''
echo ${src.rev} > source/VERSION
@ -73,7 +95,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ alexbakker babbaj ];
maintainers = with maintainers; [ alexbakker babbaj j-brn ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/build-support/replace-dependency.nix
View File

@ -1,4 +1,4 @@
{ runCommand, nix, lib }:
{ runCommandLocal, nix, lib }:
# Replace a single dependency in the requisites tree of drv, propagating
# the change all the way up the tree, without a full rebuild. This can be
@ -23,7 +23,7 @@ with lib;
let
warn = if verbose then builtins.trace else (x: y: y);
references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } ''
references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } ''
(echo {
while read path
do
@ -61,7 +61,7 @@ let
drvName = drv:
discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv));
rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } ''
rewriteHashes = drv: hashes: runCommandLocal (drvName drv) { nixStore = "${nix.out}/bin/nix-store"; } ''
$nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${
concatStringsSep " -e " (mapAttrsToList (name: value:
"'s|${baseNameOf name}|${baseNameOf value}|g'"

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
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 ];

20
pkgs/development/compilers/llvm/15/compiler-rt/default.nix
View File

@ -86,25 +86,7 @@ stdenv.mkDerivation {
../../common/compiler-rt/darwin-plistbuddy-workaround.patch
# See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893
../../common/compiler-rt/armv7l-15.patch
]
# The `compiler-rt` build inspects `ld` to figure out whether it needs to
# explicitly call `codesign`:
# https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/Modules/AddCompilerRT.cmake#L409-L422
#
# In our case, despite (currently) having an `ld` version than 609, we don't
# need an explicit codesigning step because `postLinkSignHook` handles this
# for us.
#
# Unfortunately there isn't an easy way to override
# `NEED_EXPLICIT_ADHOC_CODESIGN`.
#
# Adding `codesign` as a build input also doesn't currently work because, as
# of this writing, `codesign` in nixpkgs doesn't support the `--sign` alias
# which the `compiler-rt` build uses. See here for context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272116014
#
# So, for now, we patch `compiler-rt` to skip the explicit codesigning step.
++ lib.optional stdenv.hostPlatform.isDarwin ./skip-explicit-codesign.patch;
];
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

12
pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch
View File

@ -1,12 +0,0 @@
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
--- a/cmake/Modules/AddCompilerRT.cmake
+++ b/cmake/Modules/AddCompilerRT.cmake
@@ -406,7 +406,7 @@ function(add_compiler_rt_runtime name type)
if (HAD_ERROR)
message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}")
endif()
- set(NEED_EXPLICIT_ADHOC_CODESIGN 1)
+ set(NEED_EXPLICIT_ADHOC_CODESIGN 0) # `postLinkSignHook` handles this for us
if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*")
string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT})
if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609)

4
pkgs/development/interpreters/clojure/default.nix
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 = [

4
pkgs/development/libraries/faudio/default.nix
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];

4
pkgs/development/libraries/intel-gmmlib/default.nix
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 ];

4
pkgs/development/libraries/libglibutil/default.nix
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" ];

2
pkgs/development/libraries/libjcat/default.nix
View File

@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
description = "Library for reading and writing Jcat files";
homepage = "https://github.com/hughsie/libjcat";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

2
pkgs/development/libraries/libxmlb/default.nix
View File

@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
description = "A library to help create and query binary XML blobs";
homepage = "https://github.com/hughsie/libxmlb";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/tkrzw/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "tkrzw";
version = "1.0.24";
version = "1.0.26";
# TODO: defeat multi-output reference cycles
src = fetchurl {
url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz";
hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA=";
hash = "sha256-vbuzV4ZZnb0Vl+U9B8BorDD7mHQ7ILwkR35GaFs+aTI=";
};
postPatch = ''

19
pkgs/development/python-modules/aesedb/default.nix
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

4
pkgs/development/python-modules/aiohue/default.nix
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 = [

5
pkgs/development/python-modules/brother/default.nix
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 ];
};

4
pkgs/development/python-modules/devolo-plc-api/default.nix
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;

6
pkgs/development/python-modules/elgato/default.nix
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 = [

47
pkgs/development/python-modules/faust-cchardet/default.nix Normal file
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 ];
};
}

4
pkgs/development/python-modules/google-cloud-automl/default.nix
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 = [

25
pkgs/development/python-modules/hassil/default.nix
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 = [

5
pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
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 ];

5
pkgs/development/python-modules/home-assistant-chip-core/default.nix
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" ];

6
pkgs/development/python-modules/nettigo-air-monitor/default.nix
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 = [

4
pkgs/development/python-modules/nibe/default.nix
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 = [

48
pkgs/development/python-modules/nuheat/default.nix Normal file
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 ];
};
}

4
pkgs/development/python-modules/pontos/default.nix
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 = [

49
pkgs/development/python-modules/py-dormakaba-dkey/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, bleak
, bleak-retry-connector
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "py-dormakaba-dkey";
version = "1.0.4";
format = "pyproject";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "emontnemery";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1jIsKQa27XNVievU02jjanRWFtJDYsHolgPBab6qpM0=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
bleak
bleak-retry-connector
cryptography
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"py_dormakaba_dkey"
];
meta = with lib; {
description = "Library to interact with a Dormakaba dkey lock";
homepage = "https://github.com/emontnemery/py-dormakaba-dkey";
changelog = "https://github.com/emontnemery/py-dormakaba-dkey/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

15
pkgs/development/python-modules/pyairnow/default.nix
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 ];

13
pkgs/development/python-modules/pybalboa/default.nix
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;

23
pkgs/development/python-modules/pyinsteon/default.nix
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"
];

4
pkgs/development/python-modules/pypykatz/default.nix
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 = [

6
pkgs/development/python-modules/python-decouple/default.nix
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 = [

4
pkgs/development/python-modules/python-matter-server/default.nix
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 = [

51
pkgs/development/python-modules/python-otbr-api/default.nix Normal file
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 ];
};
}

19
pkgs/development/python-modules/syrupy/default.nix
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";

5
pkgs/development/python-modules/textual/default.nix
View File

@ -65,6 +65,11 @@ buildPythonPackage rec {
time-machine
];
disabledTestPaths = [
# snapshot tests require syrupy<4
"tests/snapshot_tests/test_snapshots.py"
];
pythonImportsCheck = [
"textual"
];

4
pkgs/development/python-modules/velbus-aio/default.nix
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;
};

17
pkgs/development/python-modules/voluptuous-serialize/default.nix
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";

8
pkgs/development/python-modules/vulcan-api/default.nix
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

4
pkgs/development/python-modules/xknx/default.nix
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 = [

17
pkgs/development/python-modules/yolink-api/default.nix
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

4
pkgs/development/python-modules/zeroconf/default.nix
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 = [

4
pkgs/development/python-modules/zigpy-znp/default.nix
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 = [

4
pkgs/development/python-modules/zwave-js-server-python/default.nix
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 = [

6
pkgs/development/tools/analysis/bingrep/default.nix
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";

11
pkgs/development/tools/dockfmt/default.nix
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 ];
};
}

21
pkgs/development/tools/gomplate/default.nix
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 ];
};
}

4
pkgs/development/tools/micronaut/default.nix
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 ];

90
pkgs/development/tools/misc/patchelf/patches/380.patch
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;

492
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -28,6 +28,7 @@
, ninja
, gcab
, gnutls
, pandoc
, protobufc
, python3
, wrapGAppsNoGuiHook
@ -79,12 +80,19 @@ let
# Experimental
haveFlashrom = isx86 && enableFlashrom;
runPythonCommand = name: buildCommandPython: runCommand name {
nativeBuildInputs = [ python3 ];
inherit buildCommandPython;
} ''
exec python3 -c "$buildCommandPython"
'';
runPythonCommand =
name:
buildCommandPython:
runCommand
name
{
nativeBuildInputs = [ python3 ];
inherit buildCommandPython;
}
''
exec python3 -c "$buildCommandPython"
'';
test-firmware =
let
@ -103,205 +111,219 @@ let
};
};
in
src // {
meta = src.meta // {
# For update script
position =
let
pos = builtins.unsafeGetAttrPos "updateScript" test-firmware;
in
pos.file + ":" + toString pos.line;
};
src // {
meta = src.meta // {
# For update script
position =
let
pos = builtins.unsafeGetAttrPos "updateScript" test-firmware;
in
pos.file + ":" + toString pos.line;
};
self = stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.8.10";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
# CLI programs go to out
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.8.12";
patches = [
# Since /etc is the domain of NixOS, not Nix,
# we cannot install files there.
# Let’s install the files to $prefix/etc
# while still reading them from /etc.
# NixOS module for fwupd will take take care of copying the files appropriately.
./add-option-for-installation-sysconfdir.patch
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
# CLI programs go to out
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
# Install plug-ins and libfwupdplugin to $out output,
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
src = fetchFromGitHub {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-a4F7skyukl4jW3apGi1ie/EcuGlkZoszyZdtLFuJewA=";
};
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
./installed-tests-path.patch
patches = [
# Since /etc is the domain of NixOS, not Nix,
# we cannot install files there.
# Let’s install the files to $prefix/etc
# while still reading them from /etc.
# NixOS module for fwupd will take take care of copying the files appropriately.
./add-option-for-installation-sysconfdir.patch
# EFI capsule is located in fwupd-efi now.
./efi-app-path.patch
];
# Install plug-ins and libfwupdplugin to $out output,
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
nativeBuildInputs = [
# required for firmware zipping
ensureNewerSourcesForZipFilesHook
meson
ninja
gi-docgen
pkg-config
gobject-introspection
gettext
shared-mime-info
valgrind
gcab
gnutls
protobufc # for protoc
python
wrapGAppsNoGuiHook
vala
];
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
./installed-tests-path.patch
buildInputs = [
polkit
libxmlb
gusb
sqlite
libarchive
curl
elfutils
libgudev
colord
libjcat
libuuid
json-glib
umockdev
bash-completion
pango
tpm2-tss
efivar
fwupd-efi
protobufc
modemmanager
libmbim
libcbor
libqmi
xz # for liblzma
] ++ lib.optionals haveDell [
libsmbios
] ++ lib.optionals haveFlashrom [
flashrom
];
# EFI capsule is located in fwupd-efi now.
./efi-app-path.patch
];
mesonFlags = [
"-Ddocs=enabled"
"-Dplugin_dummy=true"
# We are building the official releases.
"-Dsupported_build=enabled"
# Would dlopen libsoup to preserve compatibility with clients linking against older fwupd.
# https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97
"-Dsoup_session_compat=false"
"-Dudevdir=lib/udev"
"-Dsystemd_root_prefix=${placeholder "out"}"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
"--localstatedir=/var"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos"
"-Dplugin_modem_manager=enabled"
nativeBuildInputs = [
# required for firmware zipping
ensureNewerSourcesForZipFilesHook
meson
ninja
gi-docgen
pkg-config
gobject-introspection
gettext
shared-mime-info
valgrind
gcab
gnutls
pandoc
protobufc # for protoc
python
wrapGAppsNoGuiHook
vala
];
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
] ++ lib.optionals (!haveDell) [
"-Dplugin_dell=disabled"
"-Dplugin_synaptics_mst=disabled"
] ++ lib.optionals (!haveRedfish) [
"-Dplugin_redfish=disabled"
] ++ lib.optionals (!haveFlashrom) [
"-Dplugin_flashrom=disabled"
] ++ lib.optionals (!haveMSR) [
"-Dplugin_msr=disabled"
];
buildInputs = [
polkit
libxmlb
gusb
sqlite
libarchive
curl
elfutils
libgudev
colord
libjcat
libuuid
json-glib
umockdev
bash-completion
pango
tpm2-tss
efivar
fwupd-efi
protobufc
modemmanager
libmbim
libcbor
libqmi
xz # for liblzma
] ++ lib.optionals haveDell [
libsmbios
] ++ lib.optionals haveFlashrom [
flashrom
];
# TODO: wrapGAppsHook wraps efi capsule even though it is not ELF
dontWrapGApps = true;
mesonFlags = [
"-Ddocs=enabled"
"-Dplugin_dummy=true"
# We are building the official releases.
"-Dsupported_build=enabled"
# Would dlopen libsoup to preserve compatibility with clients linking against older fwupd.
# https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97
"-Dsoup_session_compat=false"
"-Dudevdir=lib/udev"
"-Dsystemd_root_prefix=${placeholder "out"}"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
"--localstatedir=/var"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Defi_os_dir=nixos"
"-Dplugin_modem_manager=enabled"
doCheck = true;
# We do not want to place the daemon into lib (cyclic reference)
"--libexecdir=${placeholder "out"}/libexec"
] ++ lib.optionals (!haveDell) [
"-Dplugin_dell=disabled"
"-Dplugin_synaptics_mst=disabled"
] ++ lib.optionals (!haveRedfish) [
"-Dplugin_redfish=disabled"
] ++ lib.optionals (!haveFlashrom) [
"-Dplugin_flashrom=disabled"
] ++ lib.optionals (!haveMSR) [
"-Dplugin_msr=disabled"
];
# Environment variables
# TODO: wrapGAppsHook wraps efi capsule even though it is not ELF
dontWrapGApps = true;
# Fontconfig error: Cannot load default config file
FONTCONFIG_FILE =
let
fontsConf = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
in fontsConf;
doCheck = true;
# error: “PolicyKit files are missing”
# https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
# Environment variables
# Phase hooks
# Fontconfig error: Cannot load default config file
FONTCONFIG_FILE =
let
fontsConf = makeFontsConf {
fontDirectories = [ freefont_ttf ];
};
in
fontsConf;
postPatch = ''
patchShebangs \
contrib/generate-version-script.py \
po/test-deps
# error: “PolicyKit files are missing”
# https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428
PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions";
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
--replace "gdbus" ${glib.bin}/bin/gdbus
# Phase hooks
# tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found
sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build
sed -i 's/test(.*)//' plugins/mtd/meson.build
# fails on amd cpu
sed -i 's/test(.*)//' libfwupdplugin/meson.build
# in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build
'';
postPatch = ''
patchShebangs \
contrib/generate-version-script.py \
po/test-deps
preBuild = ''
# jcat-tool at buildtime requires a home directory
export HOME="$(mktemp -d)"
'';
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
--replace "gdbus" ${glib.bin}/bin/gdbus
preCheck = ''
addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
# tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found
sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build
sed -i 's/test(.*)//' plugins/mtd/meson.build
# fails on amd cpu
sed -i 's/test(.*)//' libfwupdplugin/meson.build
# in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf
sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build
echo "12345678901234567890123456789012" > machine-id
export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \
LD_PRELOAD=${libredirect}/lib/libredirect.so
'';
# Device tests use device emulation and need to download emulation data from
# the internet, which does not work on our test VMs.
# It's probably better to disable these tests for NixOS by setting
# the device-tests directory to /dev/null.
# For more info on device emulation, see:
# https://github.com/fwupd/fwupd/blob/eeeac4e9ba8a6513428b456a551bffd95d533e50/docs/device-emulation.md
substituteInPlace data/installed-tests/meson.build \
--replace "join_paths(datadir, 'fwupd', 'device-tests')" "'/dev/null'"
'';
preInstall = ''
# We have pkexec on PATH so Meson will try to use it when installation fails
# due to being unable to write to e.g. /etc.
# Let’s pretend we already ran pkexec –
# the pkexec on PATH would complain it lacks setuid bit,
# obscuring the underlying error.
# https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558
export PKEXEC_UID=-1
'';
preBuild = ''
# jcat-tool at buildtime requires a home directory
export HOME="$(mktemp -d)"
'';
postInstall = ''
# These files have weird licenses so they are shipped separately.
cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd"
'';
preCheck = ''
addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
preFixup = let
echo "12345678901234567890123456789012" > machine-id
export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \
LD_PRELOAD=${libredirect}/lib/libredirect.so
'';
preInstall = ''
# We have pkexec on PATH so Meson will try to use it when installation fails
# due to being unable to write to e.g. /etc.
# Let’s pretend we already ran pkexec –
# the pkexec on PATH would complain it lacks setuid bit,
# obscuring the underlying error.
# https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558
export PKEXEC_UID=-1
'';
postInstall = ''
# These files have weird licenses so they are shipped separately.
cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd"
'';
preFixup =
let
binPath = [
efibootmgr
bubblewrap
tpm2-tools
];
in ''
in
''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
# See programs reached with fu_common_find_program_in_path in source
@ -309,60 +331,62 @@ let
)
'';
postFixup = ''
# Since we had to disable wrapGAppsHook, we need to wrap the executables manually.
find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
| while IFS= read -r -d ''' file; do
if [[ "$file" != *.efi ]]; then
echo "Wrapping program $file"
wrapGApp "$file"
fi
done
postFixup = ''
# Since we had to disable wrapGAppsHook, we need to wrap the executables manually.
find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
| while IFS= read -r -d ''' file; do
if [[ "$file" != *.efi ]]; then
echo "Wrapping program $file"
wrapGApp "$file"
fi
done
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
'';
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
'';
separateDebugInfo = true;
separateDebugInfo = true;
passthru = {
filesInstalledToEtc = [
"fwupd/bios-settings.d/README.md"
"fwupd/daemon.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
"fwupd/remotes.d/vendor-directory.conf"
"fwupd/uefi_capsule.conf"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd/LVFS-CA.pem"
"pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem"
"grub.d/35_fwupd"
] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
] ++ lib.optionals haveRedfish [
"fwupd/redfish.conf"
] ++ lib.optionals haveMSR [
"fwupd/msr.conf"
] ++ lib.optionals isx86 [
"fwupd/thunderbolt.conf"
];
passthru = {
filesInstalledToEtc = [
"fwupd/bios-settings.d/README.md"
"fwupd/daemon.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
"fwupd/remotes.d/vendor-directory.conf"
"fwupd/uefi_capsule.conf"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd/LVFS-CA.pem"
"pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem"
"grub.d/35_fwupd"
] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
] ++ lib.optionals haveRedfish [
"fwupd/redfish.conf"
] ++ lib.optionals haveMSR [
"fwupd/msr.conf"
] ++ lib.optionals isx86 [
"fwupd/thunderbolt.conf"
];
# DisabledPlugins key in fwupd/daemon.conf
defaultDisabledPlugins = [
"test"
"test_ble"
];
# DisabledPlugins key in fwupd/daemon.conf
defaultDisabledPlugins = [
"test"
"test_ble"
];
# For updating.
inherit test-firmware;
# For updating.
inherit test-firmware;
tests = let
tests =
let
listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]";
in {
in
{
installedTests = nixosTests.installed-tests.fwupd;
passthruMatches = runPythonCommand "fwupd-test-passthru-matches" ''
@ -371,29 +395,27 @@ let
import os
import pathlib
etc = '${self}/etc'
etc = '${finalAttrs.finalPackage}/etc'
package_etc = set(itertools.chain.from_iterable([[os.path.relpath(os.path.join(prefix, file), etc) for file in files] for (prefix, dirs, files) in os.walk(etc)]))
passthru_etc = set(${listToPy passthru.filesInstalledToEtc})
passthru_etc = set(${listToPy finalAttrs.passthru.filesInstalledToEtc})
assert len(package_etc - passthru_etc) == 0, f'fwupd package contains the following paths in /etc that are not listed in passthru.filesInstalledToEtc: {package_etc - passthru_etc}'
assert len(passthru_etc - package_etc) == 0, f'fwupd package lists the following paths in passthru.filesInstalledToEtc that are not contained in /etc: {passthru_etc - package_etc}'
config = configparser.RawConfigParser()
config.read('${self}/etc/fwupd/daemon.conf')
config.read('${finalAttrs.finalPackage}/etc/fwupd/daemon.conf')
package_disabled_plugins = config.get('fwupd', 'DisabledPlugins').rstrip(';').split(';')
passthru_disabled_plugins = ${listToPy passthru.defaultDisabledPlugins}
passthru_disabled_plugins = ${listToPy finalAttrs.passthru.defaultDisabledPlugins}
assert package_disabled_plugins == passthru_disabled_plugins, f'Default disabled plug-ins in the package {package_disabled_plugins} do not match those listed in passthru.defaultDisabledPlugins {passthru_disabled_plugins}'
pathlib.Path(os.getenv('out')).touch()
'';
};
};
meta = with lib; {
homepage = "https://fwupd.org/";
maintainers = with maintainers; [ jtojnar ];
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
};
in self
meta = with lib; {
homepage = "https://fwupd.org/";
maintainers = with maintainers; [ ];
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
})

15
pkgs/os-specific/linux/kvmfr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, kmod, looking-glass-client }:
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
stdenv.mkDerivation rec {
pname = "kvmfr";
@ -9,19 +9,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" "format" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
patches = lib.optional (kernel.kernelAtLeast "5.16") (fetchpatch {
name = "kvmfr-5.16.patch";
url = "https://github.com/gnif/LookingGlass/commit/a9b5302a517e19d7a2da114acf71ef1e69cfb497.patch";
sha256 = "017nxlk2f7kyjp6llwa74dbczdb1jk8v791qld81dxhzkm9dyqqx";
stripLen = 1;
})
++ lib.optional (kernel.kernelAtLeast "5.18") (fetchpatch {
name = "kvmfr-5.18.patch";
url = "https://github.com/gnif/LookingGlass/commit/c7029f95042fe902843cb6acbfc75889e93dc210.patch";
sha256 = "sha256-6DpL17XWj8BKpiBdKdCPC51MWKLIo6PixQ9UaygT2Zg=";
stripLen = 1;
});
makeFlags = [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

200
pkgs/servers/home-assistant/component-packages.nix
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,26 @@
];
"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
py-dormakaba-dkey
pyserial
pyudev
sqlalchemy
zeroconf
];
"dovado" = ps: with ps; [
]; # missing inputs: dovado
"downloader" = ps: with ps; [
@ -843,6 +842,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 +975,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -997,10 +995,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1023,10 +1018,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1074,7 +1066,7 @@
ha-ffmpeg
];
"fibaro" = ps: with ps; [
fiblary3-fork
pyfibaro
];
"fido" = ps: with ps; [
pyfido
@ -1127,10 +1119,7 @@
esphome-dashboard-api
fjaraskupan
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1376,10 +1365,7 @@
esphome-dashboard-api
fnvhash
govee-ble
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1423,12 +1409,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 +1422,6 @@
];
"hassio" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
sqlalchemy
];
"havana_shade" = ps: with ps; [
];
@ -1514,15 +1490,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 +1507,6 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
psutil-home-assistant
@ -1543,7 +1514,6 @@
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@ -1555,8 +1525,6 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
psutil-home-assistant
@ -1564,7 +1532,6 @@
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@ -1598,11 +1565,10 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyroute2
pyserial
python-otbr-api
pyudev
sqlalchemy
zeroconf
@ -1683,11 +1649,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ibeacon-ble
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1744,11 +1707,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
inkbird-ble
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1877,11 +1837,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
kegtron-ble
pillow
pyserial
pyudev
sqlalchemy
@ -1907,10 +1864,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -1930,6 +1884,8 @@
pykmtronic
];
"knx" = ps: with ps; [
aiohttp-cors
janus
xknx
];
"kodi" = ps: with ps; [
@ -1999,10 +1955,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -2021,11 +1974,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
led-ble
pillow
pyserial
pyudev
sqlalchemy
@ -2233,10 +2183,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -2320,11 +2267,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
moat-ble
pillow
pyserial
pyudev
sqlalchemy
@ -2378,15 +2322,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 +2535,8 @@
aio-geojson-nsw-rfs-incidents
];
"nuheat" = ps: with ps; [
]; # missing inputs: nuheat
nuheat
];
"nuki" = ps: with ps; [
pynuki
];
@ -2638,8 +2581,6 @@
"onboarding" = ps: with ps; [
aiohttp-cors
fnvhash
home-assistant-frontend
janus
pillow
sqlalchemy
];
@ -2725,11 +2666,8 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
oralb-ble
pillow
pyserial
pyudev
sqlalchemy
@ -2745,11 +2683,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 +2879,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
qingping-ble
@ -3004,12 +2940,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 +3070,6 @@
bluetooth-data-tools
dbus-fast
fnvhash
home-assistant-frontend
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3159,10 +3087,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
ruuvitag-ble
@ -3260,10 +3185,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3288,10 +3210,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sensorpro-ble
@ -3311,10 +3230,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sensorpush-ble
@ -3362,9 +3278,6 @@
bluetooth-data-tools
dbus-fast
fnvhash
home-assistant-frontend
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3490,10 +3403,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pysnooz
pyudev
@ -3673,10 +3583,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3798,10 +3705,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3823,10 +3727,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3845,6 +3746,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 +3779,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -3924,6 +3829,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 +4172,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -4303,10 +4208,7 @@
dbus-fast
esphome-dashboard-api
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial
pyudev
sqlalchemy
@ -4382,15 +4284,12 @@
aiohttp-cors
bellows
fnvhash
home-assistant-frontend
ifaddr
janus
pillow
pyserial-asyncio
pyserial
pyudev
sqlalchemy
zeroconf
zha-quirks
zigpy-deconz
zigpy-xbee
@ -4555,6 +4454,7 @@
"dlna_dms"
"dnsip"
"doorbird"
"dormakaba_dkey"
"dsmr"
"dsmr_reader"
"dte_energy_bridge"
@ -4804,6 +4704,7 @@
"modern_forms"
"mold_indicator"
"moon"
"mopeka"
"motion_blinds"
"motioneye"
"mqtt"
@ -4839,6 +4740,7 @@
"notify_events"
"notion"
"nsw_rural_fire_service_feed"
"nuheat"
"nuki"
"number"
"nut"
@ -4863,6 +4765,7 @@
"openweathermap"
"opnsense"
"oralb"
"otbr"
"overkiz"
"ovo_energy"
"owntracks"
@ -5053,6 +4956,7 @@
"toon"
"totalconnect"
"tplink"
"tplink_omada"
"traccar"
"trace"
"tractive"

58
pkgs/servers/home-assistant/default.nix
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

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
# 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

4
pkgs/servers/home-assistant/intents.nix
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";

6
pkgs/servers/home-assistant/patches/ffmpeg-path.patch
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:

7
pkgs/servers/home-assistant/stubs.nix
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 = [

7
pkgs/servers/home-assistant/tests.nix
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}" ];

18
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.3.6";
version = "9.4.2";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw=";
sha256 = "sha256-dSKIQiav6y4P1e/7CptIdRuOrDdXdvItCaRBcbepadE=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM=";
sha256 = "sha256-dBp6V5ozu1koSoXIecjysSIdG0hL1K5lH9Z8yougUKo=";
};
vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4=";
vendorSha256 = "sha256-atnlEdGDiUqQkslvRlPSi6VC5rEvRVV6R2Wxur3geew=";
nativeBuildInputs = [ wire ];
@ -28,8 +28,14 @@ buildGoModule rec {
wire gen -tags oss ./pkg/server
wire gen -tags oss ./pkg/cmd/grafana-cli/runner
GOARCH= CGO_ENABLED=0 go generate ./pkg/framework/coremodel
GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins
GOARCH= CGO_ENABLED=0 go generate ./pkg/plugins/plugindef
GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go
GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go
GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go
# Work around `main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm`.
# Apparently these files confuse the dependency resolution for the go builder implemented here.
rm pkg/util/xorm/go.{mod,sum}
# The testcase makes an API call against grafana.com:
#

4
pkgs/tools/admin/chamber/default.nix
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;

4
pkgs/tools/admin/cli53/default.nix
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=";

6
pkgs/tools/admin/copilot-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "copilot-cli";
version = "1.25.0";
version = "1.26.0";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Lhg3ZOCv5FlMh2FI92s8OR1XugkX0occv0ku7MKhL+8=";
sha256 = "sha256-pmP1PqkLq5rkod896oRsSY3UX6q7F4kVREw8R+mLf2Y=";
};
vendorHash = "sha256-rxnVNAgLOVBshm6tKOfqspOy+rQP7M22+Q3HnWBVjr8=";
vendorHash = "sha256-jvK4xI0Pvv0ed6uSmfXltUkVmG4RqId4zEI9JFDzoBQ=";
nativeBuildInputs = [ installShellFiles ];

20
pkgs/tools/audio/pw-volume/default.nix
View File

@ -1,35 +1,27 @@
{ lib
, fetchFromGitHub
, fetchurl
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "pw-volume";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "smasher164";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u7Ct9Kfwld/h3b6hUZdfHNuDGE4NA3MwrmgUj4g64lw=";
sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0=";
};
cargoPatches = [
(fetchurl {
# update Cargo.lock
url = "https://github.com/smasher164/pw-volume/commit/be104eaaeb84def26b392cc44bb1e7b880bef0fc.patch";
sha256 = "sha256-gssRcKpqxSAvW+2kJzIAR/soIQ3xg6LDZ7OeXds4ulY=";
})
];
cargoSha256 = "sha256-Vzd5ZbbzJh2QqiOrBOszsNqLwxM+mm2lbGd5JtKZzEM=";
cargoSha256 = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew=";
meta = with lib; {
description = "Basic interface to PipeWire volume controls";
homepage = "https://github.com/smasher164/pw-volume";
changelog = "https://github.com/smasher164/pw-volume/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ astro ];
maintainers = with maintainers; [ astro figsoda ];
platforms = platforms.linux;
};
}

4
pkgs/tools/backup/borgmatic/default.nix
View File

@ -34,11 +34,13 @@ python3Packages.buildPythonApplication rec {
mkdir -p $out/lib/systemd/system
cp sample/systemd/borgmatic.timer $out/lib/systemd/system/
# there is another "sleep", so choose the one with the space after it
# due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544
substitute sample/systemd/borgmatic.service \
$out/lib/systemd/system/borgmatic.service \
--replace /root/.local/bin/borgmatic $out/bin/borgmatic \
--replace systemd-inhibit ${systemd}/bin/systemd-inhibit \
--replace sleep ${coreutils}/bin/sleep
--replace "sleep " "${coreutils}/bin/sleep "
'';
passthru.tests.version = testers.testVersion { package = borgmatic; };

13
pkgs/tools/misc/as-tree/cargo-lock.patch
View File

@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 991ecd8..9e94574 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,7 @@ dependencies = [
[[package]]
name = "as-tree"
-version = "0.11.1"
+version = "0.12.0"
dependencies = [
"ansi_term",
"atty",

15
pkgs/tools/misc/as-tree/default.nix
View File

@ -1,27 +1,22 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "as-tree";
version = "0.12.0";
version = "unstable-2021-03-09";
src = fetchFromGitHub {
owner = "jez";
repo = pname;
rev = version;
sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5";
rev = "0036c20f66795774eb9cda3ccbae6ca1e1c19444";
sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
};
cargoSha256 = "1m334shcja7kg134b7lnq1ksy67j5b5vblkzamrw06f6r1hkn1rc";
# the upstream 0.12.0 release didn't update the Cargo.lock file properly
# they have updated their release script, so this patch can be removed
# when the next version is released.
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM=";
meta = with lib; {
description = "Print a list of paths as a tree of paths";
homepage = "https://github.com/jez/as-tree";
license = with licenses; [ blueOak100 ];
maintainers = with maintainers; [ jshholland ];
platforms = platforms.all;
};
}

19
pkgs/tools/misc/atuin/default.nix
View File

@ -6,21 +6,22 @@
, libiconv
, Security
, SystemConfiguration
, xvfb-run
, nixosTests
}:
rustPlatform.buildRustPackage rec {
pname = "atuin";
version = "12.0.0";
version = "13.0.1";
src = fetchFromGitHub {
owner = "ellie";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kt0Xu95E3MayUybSh1mU5frJoU7BF41Hnjqqrz/cVHE=";
hash = "sha256-yNn67lceg1XA72LDRRjCgSsKfEN/P5VUAnKO//ru0nc=";
};
cargoSha256 = "sha256-WAAelEFtHlFGDk0AI381OS5bxN58Z46kyMAuL+XX/Ac=";
cargoHash = "sha256-oIK2upvAapYU6WkoWjiwcmq57TDbDBTc+2OjsMdv23E=";
nativeBuildInputs = [ installShellFiles ];
@ -33,6 +34,16 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/atuin gen-completions -s zsh)
'';
nativeCheckInputs = [
xvfb-run
];
checkPhase = ''
runHook preCheck
xvfb-run cargo test
runHook postCheck
'';
passthru.tests = {
inherit (nixosTests) atuin;
};
@ -41,6 +52,6 @@ rustPlatform.buildRustPackage rec {
description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
homepage = "https://github.com/ellie/atuin";
license = licenses.mit;
maintainers = with maintainers; [ onsails SuperSandro2000 sciencentistguy ];
maintainers = with maintainers; [ SuperSandro2000 sciencentistguy _0x4A6F ];
};
}

27
pkgs/tools/misc/grass-sass/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchCrate
}:
rustPlatform.buildRustPackage rec {
pname = "grass";
version = "0.12.3";
src = fetchCrate {
inherit pname version;
hash = "sha256-qx63icK4g/5LqKUsJpXs2Jpv30RuvIeLF6JNrTTkcLs=";
};
cargoHash = "sha256-v2ikP+zujj6GWN1ZwPIKK0jtF8Na5PaR1ZNelGdLzMM=";
# tests require rust nightly
doCheck = false;
meta = with lib; {
description = "A Sass compiler written purely in Rust";
homepage = "https://github.com/connorskees/grass";
changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${replaceStrings [ "." ] [ "" ] version}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

58
pkgs/tools/misc/kb/default.nix Normal file
View File

@ -0,0 +1,58 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "kb";
version = "0.1.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "gnebbia";
repo = pname;
rev = "v${version}";
hash = "sha256-K8EAqZbl2e0h03fFwaKIclZTZARDQp1tRo44znxwW0I=";
};
postPatch = ''
# `attr` module is not available. And `attrs` defines another `attr` package
# that shadows it.
substituteInPlace setup.py \
--replace \
"install_requires=[\"colored\",\"toml\",\"attr\",\"attrs\",\"gitpython\"]," \
"install_requires=[\"colored\",\"toml\",\"attrs\",\"gitpython\"],"
# pytest coverage reporting isn't necessary
substituteInPlace setup.cfg \
--replace \
"addopts = --cov=kb --cov-report term-missing" ""
'';
propagatedBuildInputs = with python3.pkgs; [
colored
toml
attrs
gitpython
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
];
meta = with lib; {
description = "A minimalist command line knowledge base manager";
longDescription = ''
kb is a text-oriented minimalist command line knowledge base manager. kb
can be considered a quick note collection and access tool oriented toward
software developers, penetration testers, hackers, students or whoever has
to collect and organize notes in a clean way. Although kb is mainly
targeted on text-based note collection, it supports non-text files as well
(e.g., images, pdf, videos and others).
'';
homepage = "https://github.com/gnebbia/kb";
changelog = "https://github.com/gnebbia/kb/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wesleyjrz ];
};
}

6
pkgs/tools/misc/tailspin/default.nix
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;

4
pkgs/tools/misc/yutto/default.nix
View File

@ -9,14 +9,14 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "yutto";
version = "2.0.0b18";
version = "2.0.0b20";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-BuubfySQfw4ljWTc1yyW4Zqle0VTimFLQ6enZA3joeQ=";
hash = "sha256-9tYc8MlKZ1pzuGMipy827RoUJkU+C6UQz/Cex48UhLQ=";
};
nativeBuildInputs = [

9
pkgs/tools/security/asnmap/default.nix
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 ];
};

6
pkgs/tools/security/grype/default.nix
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

4
pkgs/tools/security/saml2aws/default.nix
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=";

6
pkgs/tools/security/trufflehog/default.nix
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;

22
pkgs/tools/text/book-summary/default.nix
View File

@ -1,30 +1,18 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, fetchCrate
}:
rustPlatform.buildRustPackage rec {
pname = "book-summary";
version = "0.2.1";
src = fetchFromGitHub {
owner = "dvogt23";
repo = pname;
rev = version;
sha256 = "1dawddkpyasy22biqz35c912xqmwcx6ihpqp6cnikbdzv8ni8adr";
src = fetchCrate {
inherit pname version;
hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c=";
};
cargoPatches = [
# add Cargo.lock
# can be removed after https://github.com/dvogt23/book-summary/pull/23 gets merged
(fetchpatch {
url = "https://github.com/dvogt23/book-summary/commit/9d941a57db5cd2fd0e9813230d69eb1d166a48f8.patch";
sha256 = "sha256-91dwJKdaLukxVZHA3RH1rxj45U/+mabFTflBaLd2rK8=";
})
];
cargoSha256 = "sha256-chuEzYUfZC/ZdWIUEmAXJAnXG2s8mCcNs6cuq8Lh5PQ=";
cargoHash = "sha256-QwydecdQaxvh6vWZvO30zgvvgUT6T5dvGRSmcuTUJmc=";
meta = with lib; {
description = "Book auto-summary for gitbook and mdBook";

6
pkgs/tools/text/gucci/default.nix
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}" ];

6
pkgs/tools/text/mdbook-katex/default.nix
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";

Some files were not shown because too many files have changed in this diff Show More