mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/sabctools/default.nix
This commit is contained in:
Martin Weinelt
commit
eba4d277a0
@ -9308,6 +9308,12 @@
|
||||
githubId = 5124422;
|
||||
name = "Julien Urraca";
|
||||
};
|
||||
justanotherariel = {
|
||||
email = "ariel@ebersberger.io";
|
||||
github = "justanotherariel";
|
||||
githubId = 31776703;
|
||||
name = "Ariel Ebersberger";
|
||||
};
|
||||
justinas = {
|
||||
email = "justinas@justinas.org";
|
||||
github = "justinas";
|
||||
@ -13024,6 +13030,12 @@
|
||||
githubId = 77314501;
|
||||
name = "Maurice Zhou";
|
||||
};
|
||||
Nebucatnetzer = {
|
||||
email = "andreas+nixpkgs@zweili.ch";
|
||||
github = "Nebucatnetzer";
|
||||
githubId = 2287221;
|
||||
name = "Andreas Zweili";
|
||||
};
|
||||
Necior = {
|
||||
email = "adrian@sadlocha.eu";
|
||||
github = "Necior";
|
||||
|
||||
@ -39,8 +39,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
|
||||
with subtest("squeezelite player successfully connects to slimserver"):
|
||||
machine.wait_for_unit("squeezelite.service")
|
||||
machine.wait_until_succeeds("journalctl -u squeezelite.service | grep 'slimproto:937 connected'")
|
||||
player_mac = machine.wait_until_succeeds("journalctl -eu squeezelite.service | grep 'sendHELO:148 mac:'").strip().split(" ")[-1]
|
||||
machine.wait_until_succeeds("journalctl -u squeezelite.service | grep -E 'slimproto:[0-9]+ connected'")
|
||||
player_mac = machine.wait_until_succeeds("journalctl -eu squeezelite.service | grep -E 'sendHELO:[0-9]+ mac:'").strip().split(" ")[-1]
|
||||
player_id = machine.succeed(f"curl http://localhost:9000/jsonrpc.js -g -X POST -d '{json.dumps(rpc_get_player)}'")
|
||||
assert player_mac == json.loads(player_id)["result"]["_id"], "squeezelite player not found"
|
||||
'';
|
||||
|
||||
@ -44,13 +44,13 @@ stdenv.mkDerivation {
|
||||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "1.9.9.1449";
|
||||
version = "1.9.9.1463";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "8581aba8b1b67af272b89b62a7a9b56082307ab6";
|
||||
hash = "sha256-/qyoc0/7Q8yiu5AhuLQFUiE88wf+/ejHjSucjpoN5bI=";
|
||||
rev = "c2534dc4139f3635ff7aed49b90ff03c43723dd9";
|
||||
hash = "sha256-MTGeF62jb7auOtUDougWZz7VJUNCBD/QL9jfDB7UmQE=";
|
||||
};
|
||||
|
||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||
|
||||
@ -30,8 +30,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
|
||||
mktplcRef = {
|
||||
name = "vsliveshare";
|
||||
publisher = "ms-vsliveshare";
|
||||
version = "1.0.5834";
|
||||
sha256 = "sha256-+KfivY8W1VtUxhdXuUKI5e1elo6Ert1Tsf4xVXsKB3Y=";
|
||||
version = "1.0.5900";
|
||||
sha256 = "sha256-syVW/aS2ppJjg4OZaenzGM3lczt+sLy7prwsYFTDl9s=";
|
||||
};
|
||||
}).overrideAttrs({ buildInputs ? [], ... }: {
|
||||
buildInputs = buildInputs ++ libs;
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphicsmagick";
|
||||
version = "1.3.39";
|
||||
version = "1.3.42";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
|
||||
sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8=";
|
||||
sha256 = "sha256-SE/M/Ssvr2wrqRUUaezlByvLkbpO1z517T2ORsdZ1Vc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,44 +1,40 @@
|
||||
{ lib, stdenv, fetchurl, p7zip
|
||||
, nss, nspr, libusb1
|
||||
, qtbase, qtmultimedia, qtserialport
|
||||
, autoPatchelfHook, wrapQtAppsHook
|
||||
, qtbase, qtmultimedia, qtserialport, cups
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.2.01";
|
||||
version = "1.4.05";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
autoPatchelfHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-V4hswyj6Ly6inaIlHlxpvER8ar09wZ55Ad+xH4GbHfs=";
|
||||
sha256 = "sha256-GLwxzSTzunbFrfT5e1xeHuy3O+kokb4fi4BPsFZ9tOA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
nss nspr libusb1
|
||||
qtbase qtmultimedia qtserialport
|
||||
qtbase qtmultimedia qtserialport cups
|
||||
];
|
||||
|
||||
# We nuke the vendored Qt5 libraries that LightBurn ships and instead use our
|
||||
# own.
|
||||
unpackPhase = ''
|
||||
7z x $src
|
||||
rm -rf LightBurn/lib LightBurn/plugins
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share $out/bin
|
||||
cp -ar LightBurn $out/share/LightBurn
|
||||
ln -s $out/share/LightBurn/LightBurn $out/bin
|
||||
|
||||
wrapQtApp $out/bin/LightBurn
|
||||
ln -s $out/share/LightBurn/AppRun $out/bin/LightBurn
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
description = "Layout, editing, and control software for your laser cutter";
|
||||
homepage = "https://lightburnsoftware.com/";
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-48ZFSE+uFEtY3ry3ONT/d+KhfX93eTyW8z+PiXQqEn4=";
|
||||
hash = "sha256-hg2sfBEh3jjVwMFmkgu9nXuXARsPqvlxzxX7kjSI/JU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "32.5.1";
|
||||
version = "32.5.2";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
|
||||
];
|
||||
hash = if withGTK3 then
|
||||
"sha256-hWqL/WoRRigw8cNeJImOQLM8hewyS3PYNGr2WYP+cMk="
|
||||
"sha256-DPGRcgZTPBeMkA7KpL47wE4fQt33qw4f84HuAy2lkY8="
|
||||
else
|
||||
"sha256-dlBnXP3WUgQ0spkLRowfzMcPArhGfpowsvwgCA+kvUA=";
|
||||
"sha256-/tZj1b+IxUJOpKQToQ8iF/A+KL8W1nt9Tdc5VrwoPbs=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "civo";
|
||||
version = "1.0.70";
|
||||
version = "1.0.72";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "civo";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QhCyGeK/j3oKjJM1XhCcXXAKK+jnTksmpoDox8vjF8Y=";
|
||||
sha256 = "sha256-UK/vxfasiRzU0WTLKPkGJSkOX0vpDy1OUwGyTmEwsB0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BE5CxzpY82VBn7/YlHr8FQy7UOzcVQe23naUU/9SxZ4=";
|
||||
vendorHash = "sha256-uKssj80EkuFS9UB0EZxEf7ZYk4hlnrKD5QKJnRMwV4o=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -3,14 +3,14 @@ let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.39";
|
||||
ptb = "0.0.61";
|
||||
canary = "0.0.224";
|
||||
development = "0.0.1";
|
||||
ptb = "0.0.63";
|
||||
canary = "0.0.233";
|
||||
development = "0.0.7";
|
||||
} else {
|
||||
stable = "0.0.289";
|
||||
ptb = "0.0.91";
|
||||
canary = "0.0.374";
|
||||
development = "0.0.15";
|
||||
stable = "0.0.290";
|
||||
ptb = "0.0.93";
|
||||
canary = "0.0.379";
|
||||
development = "0.0.17";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
@ -21,33 +21,33 @@ let
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-wyP1a1bMpMx3m61EA6vtak1K4HOtCl6eMjh1DlHz5J8=";
|
||||
hash = "sha256-yJ+EGFpTD0GP9rK4WM6wRZ6HP+zfQ0l3tMHMnNNym5g=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-SDF4woekFmy6VUqYTfSZi4aqtZ5ARgaex6+8qOMSHMQ=";
|
||||
hash = "sha256-FGSIpb9CAzk9P0DJckwnlVbsfoaXRsOHc7GNESLcYlk=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
hash = "sha256-unzPakomF2hmiikrNfnOueBdcuZCz2z3oCA7Djn6OmY=";
|
||||
hash = "sha256-0XR6c1ratEQARXgNTbc6KBKBvZ9P+RL6m8RkmWW9dtE=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
hash = "sha256-3XaiaWdP7GSnMeR6yU5lfeumrVm6WpUmitVuSs+xAvE=";
|
||||
hash = "sha256-Y3Gp/4aaJc1JAPgknYAoTC5NaquWg/KFk4Iw+yg5bxU=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-8pAoi8rAaHC17GxlDGEJxGX726qRe1LVMTQK6SngniM=";
|
||||
hash = "sha256-FEoxNiqDz0OivDoJzX1wnr69cJhz53sg7nb4iqiS1uQ=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-CiE33dAcX/aAjOncpX62KX+XfrRd5FgH8qQ2picwe6Q=";
|
||||
hash = "sha256-iglS02KIcpgZIDx514QzEhqwT55XOPU+8aW0HSrjYCQ=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-Fxxrjkj3W1MagT4rCxVEtip1W9MImsdQOuHXKPKsEtM=";
|
||||
hash = "sha256-A8Dg1r7iGJyfB6VgzpyZj1CogPwQgZ3aMIKUoN0WlbY=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
||||
@ -1,44 +1,32 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoconf
|
||||
, automake
|
||||
, bison
|
||||
, flex
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "bip";
|
||||
version = "0.8.9";
|
||||
version = "0.9.3";
|
||||
|
||||
# fetch sources from debian, because the creator's website provides
|
||||
# the files only via https but with an untrusted certificate.
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz";
|
||||
sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w";
|
||||
# Note that the number behind download is not predictable
|
||||
url = "https://projects.duckcorp.org/attachments/download/146/bip-0.9.3.tar.gz";
|
||||
hash = "sha256-K+6AC8mg0aLQsCgiDoFBM5w2XrR+V2tfWnI8ByeRmOI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake ];
|
||||
buildInputs = [ bison flex openssl ];
|
||||
|
||||
# includes an important security patch
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/bip-freenode.patch";
|
||||
sha256 = "05qy7a62p16f5knrsdv2lkhc07al18qq32ciq3k4r0lq1wbahj2y";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff";
|
||||
sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/87192685f55856d2c28021963ab2c308e21faddc/diff?format=diff";
|
||||
sha256 = "0rspzp7q1lq8v0cl0c35xxpgisfk264i648vslgsjax2s0g9svx0";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/814d54c676d5827f6ea37c1cd2d6e846d080c13c/diff?format=diff";
|
||||
sha256 = "137l77kmm6p9p4c4kvw2zc4xkr10ayyc9z5rlpwn67574h47v55i";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/d2dcb0adb1aa8c2c4526aa6ad650483b0e02ab7d/diff?format=diff";
|
||||
sha256 = "1pvywaljdkmy4870xs6gvsk4qwg69h47qr0yjywbcdsfycrgp8aq";
|
||||
})
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier";
|
||||
# FIXME: Openssl3 deprecated PEM_read_DHparams and DH_free
|
||||
# https://projects.duckcorp.org/issues/780
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
|
||||
|
||||
meta = {
|
||||
description = "An IRC proxy (bouncer)";
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "3.0.1";
|
||||
version = "3.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-lj+V5mntZzED2ZS62Uwlt/vTXwSuwzXeuEw8y/bA6og=";
|
||||
url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
|
||||
hash = "sha256-/rMPNIpjkHdLE0lAdWCz71DbcqIW+1Y6RdFrYAfTSKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,12 +46,15 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "All-in-one Calendars, Tasks and Scheduler";
|
||||
homepage = "https://morgen.so/download";
|
||||
mainProgram = "morgen";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
maintainers = with maintainers; [ justanotherariel wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
26
pkgs/applications/office/morgen/update.sh
Executable file
26
pkgs/applications/office/morgen/update.sh
Executable file
@ -0,0 +1,26 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# URL to check for the latest version
|
||||
latestUrl="https://dl.todesktop.com/210203cqcj00tw1/linux/deb/x64"
|
||||
|
||||
# Fetch the latest version information
|
||||
latestInfo=$(curl -sI -X GET $latestUrl | grep -oP 'morgen-\K\d+(\.\d+)*(?=[^\d])')
|
||||
|
||||
if [[ -z "$latestInfo" ]]; then
|
||||
echo "Could not find the latest version number."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extract the version number
|
||||
latestVersion=$(echo "$latestInfo" | head -n 1)
|
||||
|
||||
echo "Latest version of Morgen is $latestVersion"
|
||||
|
||||
# Update the package definition
|
||||
update-source-version morgen "$latestVersion"
|
||||
|
||||
# Fetch and update the hash
|
||||
nix-prefetch-url --unpack "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb"
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-12-24";
|
||||
version = "unstable-2024-01-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "a73f268c7bdec0badf83538a476308861d0d4726";
|
||||
sha256 = "hAXzOYUXYTYxKoku1HqIDVXWkJBVCXbbvNdBVsVEbC4=";
|
||||
rev = "a8641361b839ed0720f9c6e043420945ac2427a7";
|
||||
sha256 = "MTRcG9fsyypDmVHRgtQFqbbSb0n7X7kXuEM6oYy/OVc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-aBH3TtPFuJXtVvGTJcGJev5DYVwqjUAM9cf5PatJq9Y=";
|
||||
hash = "sha256-qNnai2THSUyvtcnU5+Rdq+/EJe4HXw05bGTRz+wyXM8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vcsh";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-8KkTU1BrO39vgWproT+QsRaBN2I6WR3lp4Oehd6yOMs=";
|
||||
sha256 = "sha256-Rx5yBCDRqFNyhP0Pfoo2upn7t4Yh5hxTgNKmMtaY/08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -29,27 +29,22 @@ let
|
||||
basename = "streamlink-twitch-gui";
|
||||
runtimeLibs = lib.makeLibraryPath [ gtk3-x11 libudev0-shim ];
|
||||
runtimeBins = lib.makeBinPath [ streamlink ];
|
||||
arch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux"
|
||||
then
|
||||
"linux64"
|
||||
else
|
||||
"linux32";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${basename}-bin";
|
||||
version = "2.1.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz";
|
||||
hash =
|
||||
if arch == "linux64"
|
||||
then
|
||||
"sha256-kfCGhIgKMI0siDqnmIHSMk6RMHFlW6uwVsW48aiRua0="
|
||||
else
|
||||
"sha256-+jgTpIYb4BPM7Ixmo+YUeOX5OlQlMaRVEXf3WzS2lAI=";
|
||||
};
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-linux64.tar.gz";
|
||||
hash = "sha256-uzD61Q1XIthAwoJHb0H4sTdYkUj0qGeGs1h0XFeV03E=";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-linux32.tar.gz";
|
||||
hash = "sha256-akJEd94PmH9YeBud+l5+5QpbnzXAD0jDBKJM4h/t2EA=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = with xorg; [
|
||||
at-spi2-core
|
||||
|
||||
40
pkgs/by-name/dm/dmarc-report-converter/package.nix
Normal file
40
pkgs/by-name/dm/dmarc-report-converter/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, dmarc-report-converter
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dmarc-report-converter";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tierpod";
|
||||
repo = "dmarc-report-converter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4rAQhZmqYldilCKomBfuyqS0vcUg5yS4nqp84XSjam4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
simple = runCommand "${pname}-test" { } ''
|
||||
${dmarc-report-converter}/bin/dmarc-report-converter -h > $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert DMARC report files from xml to human-readable formats";
|
||||
homepage = "https://github.com/tierpod/dmarc-report-converter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Nebucatnetzer ];
|
||||
mainProgram = "dmarc-report-converter";
|
||||
};
|
||||
}
|
||||
@ -4,16 +4,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "drone-scp";
|
||||
version = "1.6.13";
|
||||
version = "1.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "appleboy";
|
||||
repo = "drone-scp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xto5QPrrPzGFy9GYUfK8lFUcXxi9gGHHs/84FdSjbYc=";
|
||||
hash = "sha256-RxpDlQ6lYT6XH5zrYZaRO5YsB++7Ujr7dvgsTtXIBfc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rVS2ZKeJou/ZfLvNMd6jMRYMYuDXiqGyZSSDX9y3FQo=";
|
||||
vendorHash = "sha256-0/RGPvafOLT/O0l9ENoiHLmtOaP3DpjmXjmotuxF944=";
|
||||
|
||||
# Needs a specific user...
|
||||
doCheck = false;
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goldwarden";
|
||||
version = "0.2.7";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quexten";
|
||||
repo = "goldwarden";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OXJovoJ2+YIMqzoG6J2LlxUC5DMZRAdEl+ZEv6PDXlI=";
|
||||
hash = "sha256-UjNDr5iWOd34VrKCrYVlPJVbKq/HizupYJ9H4jJq8oI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1Px60+f23qoP5eEOUC3WG5vKJYjbD3bPOrDyBpXlMT0=";
|
||||
vendorHash = "sha256-AiYgI2dBhVYxGNU7t4dywi8KWiffO6V05KFYoGzA0t4=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-cowsql";
|
||||
version = "0.18.3";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cowsql";
|
||||
repo = "raft";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lfmn+GfdgZ5fdp3Y6ROzEuXsrLNlH/qA98Ni5QAv0oQ=";
|
||||
hash = "sha256-GF+dfkdBNamaix+teJQfhiVMGFwHoAj6GeQj9EpuhYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -12,13 +12,13 @@ let
|
||||
inherit (llvmPackages) stdenv;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "odin";
|
||||
version = "dev-2023-12";
|
||||
version = "dev-2024-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odin-lang";
|
||||
repo = "Odin";
|
||||
rev = version;
|
||||
hash = "sha256-XFaXs9zNQ/53QprF8pM2pOtiB0nGu8mGbBozNl0EMyA=";
|
||||
hash = "sha256-ufIpnibY7rd76l0Mh+qXYXkc8W3cuTJ1cbmj4SgSUis=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gsasl";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gsasl/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k=";
|
||||
sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU=";
|
||||
};
|
||||
|
||||
# This is actually bug in musl. It is already fixed in trunc and
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libiconv";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
|
||||
sha256 = "016c57srqr0bza5fxjxfrx6aqxkqy0s3gkhcg7p7fhk5i6sv38g6";
|
||||
sha256 = "sha256-j3QhO1YjjIWlClMp934GGYdx5w3Zpzl3n0wC9l2XExM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libuev";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "libuev";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x6l7CqlZ82kc8shAf2SxgIa4ESu0fTtnOgGz5joVCEY=";
|
||||
hash = "sha256-x1Sk7IuhlBQPFL7Rq4tmEanBxI/WaQ2L5fpUyEWOoi8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Lightweight event loop library for Linux epoll() family APIs";
|
||||
homepage = "https://codedocs.xyz/troglobit/libuev/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ vifino ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xcb-imdkit";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "xcb-imdkit";
|
||||
rev = version;
|
||||
sha256 = "sha256-jbIhcxZzGlklpoMjLAYkKlh/CBE8R4jARO6nfnzSXOQ=";
|
||||
sha256 = "sha256-1+x4KE2xh6KWbdCBlPxDvHvcKUEj4hiW4fEPCeYfTwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xeus";
|
||||
version = "3.1.4";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-xeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1QaMACLqTWC74V7l2LHLUMN/s/N4kNrE7+Ny1wkbavs=";
|
||||
sha256 = "sha256-Fh1MSA3pRWgCT5V01gawjtto2fv+04vIV+4+OGhaxJA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "Jc2k";
|
||||
repo = "aiohomekit";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6dR7hMcHOjbFl4tnInMEYfnEWMFx+A+9TXoBcB83mrE=";
|
||||
hash = "sha256-GepXC3u37NuTWCoecUkR1+Ic/5ztn3f6cUlalZ0Na4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-awkward";
|
||||
version = "2023.12.2";
|
||||
version = "2024.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "dask-contrib";
|
||||
repo = "dask-awkward";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MfZ3mdCCShD/rcqHx7xyujXax5t96RQI1e2Ckyif9e4=";
|
||||
hash = "sha256-LxkiEQDHuVCRUoYgRwvMgBff22mzOvPmDoqczRweWB8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = "dvc-data";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-It7l74R1cD9r6SmQfxCZ1VvuO0BLqjP2DEGHCKy99n8=";
|
||||
hash = "sha256-ycC6NWvU00yUEHu62H5VLKDEZEHyIo4+TBwj5XaswII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -55,14 +55,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.37.0";
|
||||
version = "3.38.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mO6fhPUub09nWmiFSciwNhuS4VJAjQgIukc+lQWB7Qg=";
|
||||
hash = "sha256-hhlwXvP/XqZfFFXo1yPK4TdKUECZXfKCWhCcGotyDCk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flowlogs-reader";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
repo = pname;
|
||||
# https://github.com/obsrvbl/flowlogs-reader/issues/57
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XHRibTSzFzWPz50elz+KdbCwTrd1DKfVMSg6UamNbzc=";
|
||||
hash = "sha256-9UwCRLRKuIFRTh3ntAzlXCyN175J1wobT3GSLAhl+08=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "habluetooth";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "habluetooth";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vUq3WVo9dAt4Q/oid9ixLwI6v6jCavRU9FZYR6t6TzI=";
|
||||
hash = "sha256-3HyFKg+JR48MQrWmOjOQV2qhVHRHLnJHvtvBajXPDMg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ python_openzwave, fetchPypi, openzwave, fetchFromGitHub }:
|
||||
|
||||
(python_openzwave.override {
|
||||
openzwave = openzwave.overrideAttrs (oldAttrs: {
|
||||
version = "unstable-2020-03-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant";
|
||||
repo = "open-zwave";
|
||||
rev = "94267fa298c1882f0dc73c0fd08f1f755ba83e83";
|
||||
sha256 = "0p2869fwidz1wcqzfm52cwm9ab96pmwkna3d4yvvh21nh09cvmwk";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
});
|
||||
}).overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "homeassistant_pyozw";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "47c1abd8f3dc287760471c6c7b5fad222ead64763c4cb25e37d0599ea3b26952";
|
||||
};
|
||||
|
||||
patches = [];
|
||||
meta.homepage = "https://github.com/home-assistant/python-openzwave";
|
||||
})
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openwebifpy";
|
||||
version = "4.0.2";
|
||||
version = "4.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-D2NCTn1Q3/AknmEAAOZO4d7i2mpM/kMlt94RaLmmnjM=";
|
||||
hash = "sha256-mGCi3nFnyzA+yKD5qtpErXYjOA6liZRiy7qJTbTGGnQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orvibo";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "happyleavesaoc";
|
||||
repo = "python-orvibo";
|
||||
rev = version;
|
||||
sha256 = "042prd5yxqvlfija7ii1xn424iv1p7ndhxv6m67ij8cbvspwx356";
|
||||
sha256 = "sha256-Azmho47CEbRo18emmLKhYa/sViQX0oxUTUk4zdrpOaE=";
|
||||
};
|
||||
|
||||
# Project as no tests
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-tado";
|
||||
version = "0.17.2";
|
||||
version = "0.17.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
repo = "PyTado";
|
||||
# https://github.com/wmalgadey/PyTado/issues/62
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4=";
|
||||
hash = "sha256-whpNYiAb2cqKI4m0HJN2lPt51FLuEzrkrRTSWs6uznU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,18 +2,23 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
sabnzbd,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sabctools";
|
||||
version = "8.0.0"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3
|
||||
format = "setuptools";
|
||||
version = "8.1.0"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hrRpEVhmnm4ABSqN/F3MllCgoJCg1PdM+oVrQR+uZbk=";
|
||||
hash = "sha256-PYfbmR9wT3SHT+oFyQF2F13g7FgdvY/l9p0D65c/+RU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = ["sabctools"];
|
||||
|
||||
passthru.tests = {inherit sabnzbd;};
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.55.2";
|
||||
version = "0.55.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yZlYsaN9j8WVtxWIXeH4Jqyo0xpDOC+2DCE8UA1c9h8=";
|
||||
hash = "sha256-FTcj0xZnIt0P6J/QRMC0bwcbRIVmpSWTorvE/AV/5PU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "delve";
|
||||
version = "1.21.2";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-delve";
|
||||
repo = "delve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DgRqdO7ztQ57B6N9ABcI2D/SQkUVh/IUib8/xk3EeRA=";
|
||||
hash = "sha256-uYUl8PMBRf73wwo+oOYda0sTfD1gnDThtNc3sg8Q328=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, jdk11
|
||||
, jdk17
|
||||
, lib
|
||||
, libX11
|
||||
, libXrender
|
||||
@ -19,13 +19,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pVersion = "1.13.0.20220615";
|
||||
pVersion = "1.14.0.20230315";
|
||||
pVersionTriple = lib.splitVersion pVersion;
|
||||
majorVersion = lib.elemAt pVersionTriple 0;
|
||||
minorVersion = lib.elemAt pVersionTriple 1;
|
||||
patchVersion = lib.elemAt pVersionTriple 2;
|
||||
baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}";
|
||||
jdk = jdk11;
|
||||
jdk = jdk17;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eclipse-mat";
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip";
|
||||
sha256 = "sha256-LwtP76kb9xgdcsWCSCXeRbhFVyFS3xkl15F075Cq4Os=";
|
||||
sha256 = "sha256-9YFJILMRhIln4vo99noRxYARh1M/mjwg7t8RdAJCoW4=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint-langserver";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nametake";
|
||||
repo = "golangci-lint-langserver";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UdDWu3dZ/XUol2Y8lWk6d2zRZ+Pc1GiR6yqOuNaXxZY=";
|
||||
sha256 = "sha256-jNRDqg2a5dXo7QI4CBRw0MLwhfpdGuhygpMoSKNcgC0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg=";
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ruff-lsp";
|
||||
version = "0.0.48";
|
||||
version = "0.0.49";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff-lsp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X0vCIEfwi4UrDwFYZgEy8XkGdrZQyisx0/ae9MDalG0=";
|
||||
hash = "sha256-AL0p5NbhBxgw0mJYWcGb4EeztO7ermmcm5YrO/M8TKU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runme";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stateful";
|
||||
repo = "runme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oyPForGCRGs5go6CqrWfYYsgi5orLgC2qWei5RdOAjM=";
|
||||
hash = "sha256-ip2td0PEMga7Egd/YEGdpoUV4tnNI27BUDPYynpFhhc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vYSheywz9ZyQ0aNWFpUEn/hrrktKAhV+VLYv74k+/nM=";
|
||||
vendorHash = "sha256-PLDsea/o067ifiX0RKFC7gDpORLVEQ0DV6sdBzzQCTs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -15,16 +15,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.12.0";
|
||||
version = "5.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NYtsfHdpkh+gPUF8moNEf4thQ9DliIALRrzcE2NSHsw=";
|
||||
hash = "sha256-/M6j33KNX4leLPJg6qLubejhjacXsd7NZ77wuGtdbw8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J7T4SF2Ksuq7T2GRA/hUFZnrY2jBWmKD/sTjwS9/Kws=";
|
||||
cargoHash = "sha256-xslsj5mE7NOZYVwuxJ06hZAUWS3mhgzrl73P47mjkTY=";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "resolve-march-native";
|
||||
version = "2.2.0";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hartwork";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vJzkVL23fvFO1pGJwdPiqR73K9iNJ6OglVxL5tCVa2U=";
|
||||
hash = "sha256-fkiEWZvg/h8Gn0TL3Ov8aq2cAG5VncUTrVcUTRNOx+Y=";
|
||||
};
|
||||
|
||||
# NB: The tool uses gcc at runtime to resolve the -march=native flags
|
||||
@ -25,6 +25,6 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://github.com/hartwork/resolve-march-native";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svd2rust";
|
||||
version = "0.31.3";
|
||||
version = "0.31.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-uP3qxp6Y/VfuQ/uS+Plus/ITvHjlraWxJa2HFIzZEFI=";
|
||||
hash = "sha256-byZYKf0FujtH5VShUCVeotDUV/66QKUmmRTRld8b1bk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iPZrWOidQoA2SCKIm+utd9fXLlbcjGIYw1CaaJ7PV+I=";
|
||||
cargoHash = "sha256-Ksj67uA9RVv09PfwnjPVA+TFG4My05Mi3eDxquox/K0=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "1.129.1";
|
||||
version = "1.131.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/qApBCjwgnuCHP6DsK4LE5KA6RVu8lV84fxGVkrKyOs=";
|
||||
hash = "sha256-6IjVROKxDiLod8XWWndnxHQGnk8DJc1sjzJxLWDkRL0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lFholyFVr6uMcfafM/tb8r1/4ysgWZOW5neoy3uL0Vw=";
|
||||
vendorHash = "sha256-/hfFydNHDK6shCC4iIkdP8r1ZO9niMIWZ/Ypj/DGj+c=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGo121Module rec {
|
||||
pname = "turso-cli";
|
||||
version = "0.87.7";
|
||||
version = "0.87.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ydjYkJsHSu+jgxbup5L1GFN+c4q3gpuplUBT2Av7RgI=";
|
||||
hash = "sha256-7JdWAMMNOBRWx2sU8mQ2kLZBVDsXaVszlOQos2Ybiy4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rTeW2RQhcdwJTAMQELm4cdObJbm8gk/I2Qz3Wk3+zpI=";
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
let
|
||||
pname = "yabai";
|
||||
version = "6.0.2";
|
||||
version = "6.0.4";
|
||||
|
||||
test-version = testers.testVersion {
|
||||
package = yabai;
|
||||
@ -53,7 +53,7 @@ in
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
|
||||
hash = "sha256-aFM0rtHrHsLEziDWhRwqeCy70dSAOAX4HDpqHqvnoWs=";
|
||||
hash = "sha256-gxQBZ/7I2TVjoG5a8ea2+W4OwI9pJFbGSbZzcL5JY4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -89,7 +89,7 @@ in
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VI7Gu5Y50Ed65ZUrseMXwmW/iovlRbAJGlPD7Ooajqw=";
|
||||
hash = "sha256-U2YGgfTfhpmiBiO+S6xpsLrgI+kVUYYGLGjt8KHcBrc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p "python3.withPackages (ps: [ps.pygithub])" git gnupg
|
||||
#! nix-shell -i python -p "python3.withPackages (ps: [ps.pygithub ps.packaging])" git gnupg
|
||||
|
||||
# This is automatically called by ../update.sh.
|
||||
|
||||
@ -27,6 +27,8 @@ from typing import (
|
||||
from github import Github
|
||||
from github.GitRelease import GitRelease
|
||||
|
||||
from packaging.version import parse as parse_version, Version
|
||||
|
||||
VersionComponent = Union[int, str]
|
||||
Version = List[VersionComponent]
|
||||
|
||||
@ -39,6 +41,11 @@ Patch = TypedDict("Patch", {
|
||||
})
|
||||
|
||||
|
||||
def read_min_kernel_branch() -> List[str]:
|
||||
with open(NIXPKGS_KERNEL_PATH / "kernels-org.json") as f:
|
||||
return list(parse_version(sorted(json.load(f).keys())[0]).release)
|
||||
|
||||
|
||||
@dataclass
|
||||
class ReleaseInfo:
|
||||
version: Version
|
||||
@ -51,7 +58,7 @@ NIXPKGS_PATH = HERE.parents[4]
|
||||
HARDENED_GITHUB_REPO = "anthraxx/linux-hardened"
|
||||
HARDENED_TRUSTED_KEY = HERE / "anthraxx.asc"
|
||||
HARDENED_PATCHES_PATH = HERE / "patches.json"
|
||||
MIN_KERNEL_VERSION: Version = [4, 14]
|
||||
MIN_KERNEL_VERSION: Version = read_min_kernel_branch()
|
||||
|
||||
|
||||
def run(*args: Union[str, Path]) -> subprocess.CompletedProcess[bytes]:
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{
|
||||
"testing": {
|
||||
"version": "6.7-rc7",
|
||||
"hash": "sha256:1w1np05mqyviykj0gyx6z2l9ql4f909dy0ximh0gkcpkgy6zz9qc"
|
||||
"version": "6.7-rc8",
|
||||
"hash": "sha256:02drhwl3f53y97gimgclz61zsa57v29vphkbrzr4cwmz4sh1vngk"
|
||||
},
|
||||
"6.5": {
|
||||
"version": "6.5.13",
|
||||
"hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.69",
|
||||
"hash": "sha256:0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby"
|
||||
"version": "6.1.71",
|
||||
"hash": "sha256:0hghnwsa282js9hy4krhdbgrb4khjzslr05zgvjx9zzragfp9xrd"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.145",
|
||||
"hash": "sha256:086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j"
|
||||
"version": "5.15.146",
|
||||
"hash": "sha256:14nijbspmzd4r38l8cpl4vn9dhawzcfnhyc0gnaxl2m8l9gpm02s"
|
||||
},
|
||||
"5.10": {
|
||||
"version": "5.10.205",
|
||||
"hash": "sha256:0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5"
|
||||
"version": "5.10.206",
|
||||
"hash": "sha256:0ns8qxcrxj9i76b93xcghl002l8vbkg7ksd435sikig62qr62gf4"
|
||||
},
|
||||
"5.4": {
|
||||
"version": "5.4.265",
|
||||
@ -27,12 +27,8 @@
|
||||
"version": "4.19.303",
|
||||
"hash": "sha256:0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82"
|
||||
},
|
||||
"4.14": {
|
||||
"version": "4.14.334",
|
||||
"hash": "sha256:0iaaqdkszmfarvjfszc9rf7y9zsv3w82934xmvmzmsbiz86547ca"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.8",
|
||||
"hash": "sha256:05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh"
|
||||
"version": "6.6.10",
|
||||
"hash": "sha256:0v2l0l90w7scv7bxkxxjgqnay0fjh678k9gdlgycgbh9q7j2grly"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19453";
|
||||
sha256 = "12jy0kyhl9dsp20yprbw27kzh1p4qxi5m5zy9j7sglm9ajrbnkar";
|
||||
rev = "19459";
|
||||
sha256 = "12qx165i6dp9mrsbmizw6ynyxwvq11dmwz00xgy5qgr4ag3y4z4c";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.141-rt72"; # updated by ./update-rt.sh
|
||||
version = "5.15.145-rt73"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -18,14 +18,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1yicgvq413801qrfzr0rdzwgg45dszrvfd6y9dmrhak9bk36lvck";
|
||||
sha256 = "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0qlk43g5c0apspdg56ccb4259903nvadv4pnga07i4lg6xwb5xjw";
|
||||
sha256 = "0ddcbc1szgbb06wnp8bis7cg8idawj279867qa9kldqcws76l87p";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.4.257-rt87"; # updated by ./update-rt.sh
|
||||
version = "5.4.264-rt88"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -14,14 +14,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf";
|
||||
sha256 = "1c5n47dq9khb15hz24a000k3hj913vv1dda6famnm8wpjbfr176k";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0rgkk5ibagsyz9in12clzn7szsw1i3m96s8wy5yxwa26aaa2wki7";
|
||||
sha256 = "1yzdiip1fm9szx2hhvq9ph7jq00qglb1skis6gv0184g0ls2qddg";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "6.1.67-rt20"; # updated by ./update-rt.sh
|
||||
version = "6.1.70-rt21"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -18,14 +18,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "11cjqll3b7iq3mblwyzjrd5ph8avgk23f4mw4shm8j6ai5rdndvm";
|
||||
sha256 = "1vxgardfm2fi4c7zkxpljqicllfqqnp835a9lyb7dh2nchk6a4zd";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1s7v4dc5hjl63h0z5nai2jpd0g739nc1573f1rlnc6cqy9y26gqg";
|
||||
sha256 = "03lb5s16f7j7s7qvh55mxiv6a6rdnx2j8cyy6c6v4naaq9s82lgn";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.lxml ])"
|
||||
#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.lxml ps.packaging ])"
|
||||
import json
|
||||
import os
|
||||
import pathlib
|
||||
@ -10,6 +10,8 @@ from dataclasses import dataclass
|
||||
from enum import Enum
|
||||
|
||||
from bs4 import BeautifulSoup, NavigableString, Tag
|
||||
from packaging.version import parse as parse_version, Version
|
||||
from typing import List
|
||||
|
||||
HERE = pathlib.Path(__file__).parent
|
||||
ROOT = HERE.parent.parent.parent.parent
|
||||
@ -80,6 +82,18 @@ def get_hash(kernel: KernelRelease):
|
||||
return f"sha256:{hash}"
|
||||
|
||||
|
||||
def get_oldest_branch() -> Version:
|
||||
with open(VERSIONS_FILE) as f:
|
||||
return parse_version(sorted(json.load(f).keys())[0])
|
||||
|
||||
|
||||
def predates_oldest_branch(oldest: Version, to_compare: str) -> bool:
|
||||
if to_compare == "testing":
|
||||
return False
|
||||
|
||||
return parse_version(to_compare) < oldest
|
||||
|
||||
|
||||
def commit(message):
|
||||
return subprocess.check_call(["git", "commit", "-m", message, VERSIONS_FILE])
|
||||
|
||||
@ -97,6 +111,8 @@ def main():
|
||||
parsed_releases = filter(None, [parse_release(release) for release in releases])
|
||||
all_kernels = json.load(VERSIONS_FILE.open())
|
||||
|
||||
oldest_branch = get_oldest_branch()
|
||||
|
||||
for kernel in parsed_releases:
|
||||
branch = get_branch(kernel.version)
|
||||
nixpkgs_branch = branch.replace(".", "_")
|
||||
@ -106,6 +122,13 @@ def main():
|
||||
print(f"linux_{nixpkgs_branch}: {kernel.version} is latest, skipping...")
|
||||
continue
|
||||
|
||||
if predates_oldest_branch(oldest_branch, kernel.branch):
|
||||
print(
|
||||
f"{kernel.branch} is too old and not supported anymore, skipping...",
|
||||
file=sys.stderr
|
||||
)
|
||||
continue
|
||||
|
||||
if old_version is None:
|
||||
message = f"linux_{nixpkgs_branch}: init at {kernel.version}"
|
||||
else:
|
||||
|
||||
@ -58,6 +58,7 @@
|
||||
|
||||
with lib;
|
||||
|
||||
assert useSettings -> !libsOnly;
|
||||
assert !libsOnly -> kernel != null;
|
||||
assert versionOlder version "391" -> sha256_32bit != null;
|
||||
assert useSettings -> settingsSha256 != null;
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "23.11.0.1";
|
||||
version = "23.11.1.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
hash = "sha256-+8oDNfNg9WGET1iWarhZbQEOdjHjSshIB/otdYvl18c=";
|
||||
hash = "sha256-dfCQKKw44bD5d7Sv7e40Qm3df9Mzz7WvmWf7SP8R1KQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.1.0";
|
||||
version = "2024.1.1";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
@ -1042,9 +1042,10 @@
|
||||
aiohttp-cors
|
||||
aiohttp-fast-url-dispatcher
|
||||
aiohttp-zlib-ng
|
||||
dropmqttapi
|
||||
janus
|
||||
paho-mqtt
|
||||
]; # missing inputs: dropmqttapi
|
||||
];
|
||||
"dsmr" = ps: with ps; [
|
||||
dsmr-parser
|
||||
];
|
||||
@ -5846,6 +5847,7 @@
|
||||
"doorbird"
|
||||
"dormakaba_dkey"
|
||||
"dremel_3d_printer"
|
||||
"drop_connect"
|
||||
"dsmr"
|
||||
"dsmr_reader"
|
||||
"dte_energy_bridge"
|
||||
|
||||
@ -423,7 +423,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2024.1.0";
|
||||
hassVersion = "2024.1.1";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -441,13 +441,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aNSyBr4QEK4pmYnRGW1LNuCSU5EpZtLEGQUtYL+CvUg=";
|
||||
hash = "sha256-jTBNjVBPtxNG+5Ju3Dgjnpl9i5DM6qo92yWKNaFzfCo=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-szlvSfkcPG6DGGHZ5iNtz0EBa8DVYaoGZWSlc7AEG1I=";
|
||||
hash = "sha256-LpiZ9cvfMgzpDtEriiTeDGIsl9QX8LzebzUtb8H73VE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
||||
@ -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 = "20240103.3";
|
||||
version = "20240104.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-xCYAGig8sKZHa2Ix+XhR33xcKPucwvQFikuYjXpqzNM=";
|
||||
hash = "sha256-AQkrnU5UKsrl02CXDNf/aMTPII39poWJoZ4nBpySTZE=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.1.0";
|
||||
version = "2024.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FOf0MCyYIIoPa7H39rY+2jUy7O6/c4DDRhDHJ7tSEcU=";
|
||||
hash = "sha256-jVmjMs1OmxSnx0cQHXbAezJhkv5V8PRJOSDmfx0XQ9o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,45 +5,53 @@
|
||||
let
|
||||
# some components' tests have additional dependencies
|
||||
extraCheckInputs = with home-assistant.python.pkgs; {
|
||||
airzone_cloud = [ aioairzone ];
|
||||
alexa = [ av ];
|
||||
bluetooth = [ pyswitchbot ];
|
||||
bthome = [ xiaomi-ble ];
|
||||
camera = [ av ];
|
||||
cloud = [ mutagen ];
|
||||
config = [ pydispatcher ];
|
||||
generic = [ av ];
|
||||
google_translate = [ mutagen ];
|
||||
google_sheets = [ oauth2client ];
|
||||
govee_ble = [ ibeacon-ble ];
|
||||
hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
|
||||
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 ];
|
||||
matrix = [ pydantic ];
|
||||
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 ];
|
||||
tomorrowio = [ pyclimacell ];
|
||||
version = [ aioaseko ];
|
||||
xiaomi_miio = [ arrow ];
|
||||
voicerss = [ mutagen ];
|
||||
yandextts = [ mutagen ];
|
||||
zha = [ pydeconz ];
|
||||
zwave_js = [ homeassistant-pyozw ];
|
||||
airzone_cloud = [
|
||||
aioairzone
|
||||
];
|
||||
bluetooth = [
|
||||
pyswitchbot
|
||||
];
|
||||
govee_ble = [
|
||||
ibeacon-ble
|
||||
];
|
||||
lovelace = [
|
||||
pychromecast
|
||||
];
|
||||
matrix = [
|
||||
pydantic
|
||||
];
|
||||
mopeka = [
|
||||
pyswitchbot
|
||||
];
|
||||
onboarding = [
|
||||
pymetno
|
||||
radios
|
||||
rpi-bad-power
|
||||
];
|
||||
raspberry_pi = [
|
||||
rpi-bad-power
|
||||
];
|
||||
shelly = [
|
||||
pyswitchbot
|
||||
];
|
||||
tilt_ble = [
|
||||
ibeacon-ble
|
||||
];
|
||||
xiaomi_miio = [
|
||||
arrow
|
||||
];
|
||||
zha = [
|
||||
pydeconz
|
||||
];
|
||||
};
|
||||
|
||||
extraDisabledTestPaths = {
|
||||
};
|
||||
|
||||
extraDisabledTests = {
|
||||
mqtt = [
|
||||
# Assert None is not None
|
||||
"test_handle_logging_on_writing_the_entity_state"
|
||||
private_ble_device = [
|
||||
# AssertionError: assert '90' == '90.0'
|
||||
"test_estimated_broadcast_interval"
|
||||
];
|
||||
shell_command = [
|
||||
# tries to retrieve file from github
|
||||
@ -53,17 +61,9 @@ let
|
||||
# missing operating_status attribute in entity
|
||||
"test_sensor_entities"
|
||||
];
|
||||
vesync = [
|
||||
# homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration
|
||||
"test_async_get_config_entry_diagnostics__single_humidifier"
|
||||
"test_async_get_device_diagnostics__single_fan"
|
||||
];
|
||||
};
|
||||
|
||||
extraPytestFlagsArray = {
|
||||
conversation = [
|
||||
"--deselect tests/components/conversation/test_init.py::test_get_agent_list"
|
||||
];
|
||||
cloud = [
|
||||
# Tries to connect to alexa-api.nabucasa.com:443
|
||||
"--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state"
|
||||
@ -72,41 +72,16 @@ let
|
||||
# Tries to resolve DNS entries
|
||||
"--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
|
||||
];
|
||||
history_stats = [
|
||||
# Flaky: AssertionError: assert '0.0' == '12.0'
|
||||
"--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed"
|
||||
];
|
||||
jellyfin = [
|
||||
# AssertionError: assert 'audio/x-flac' == 'audio/flac'
|
||||
"--deselect tests/components/jellyfin/test_media_source.py::test_resolve"
|
||||
# AssertionError: assert [+ received] == [- snapshot]
|
||||
"--deselect tests/components/jellyfin/test_media_source.py::test_music_library"
|
||||
];
|
||||
modbus = [
|
||||
# homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception
|
||||
"--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"
|
||||
];
|
||||
sonos = [
|
||||
# KeyError: 'sonos_media_player'
|
||||
"--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings"
|
||||
"--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3"
|
||||
];
|
||||
unifiprotect = [
|
||||
# "TypeError: object Mock can't be used in 'await' expression
|
||||
"--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix"
|
||||
];
|
||||
xiaomi_ble = [
|
||||
# assert 0 == 1"
|
||||
"--deselect tests/components/xiaomi_ble/test_sensor.py::test_xiaomi_consumable"
|
||||
];
|
||||
zha = [
|
||||
"--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp"
|
||||
"--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp"
|
||||
];
|
||||
};
|
||||
in lib.listToAttrs (map (component: lib.nameValuePair component (
|
||||
home-assistant.overridePythonAttrs (old: {
|
||||
|
||||
@ -47,14 +47,14 @@ let
|
||||
]);
|
||||
path = lib.makeBinPath [ coreutils par2cmdline unrar unzip p7zip util-linux ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
pname = "sabnzbd";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FN2BKvO9ToTvGdYqgv0wMSPgshMrVybDs9wsBo8MkII=";
|
||||
sha256 = "sha256-ub8CwFcmxfsfhR45M5lVZvCHyzN/7CK4ElS4Q0U4qu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "0.25.1",
|
||||
"version": "0.25.2",
|
||||
"platforms": {
|
||||
"aarch64-linux": {
|
||||
"arch": "linux-arm64",
|
||||
"hash": "sha256-u5gkAcSw0AG0+NK3/1O90leOyM8I03/EXxFAXoFSqt4="
|
||||
"hash": "sha256-cSKOSy31mwRn8hw4fSm3w7+8Y4MeQs4+ZN+/pOX15jM="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"arch": "linux-amd64",
|
||||
"hash": "sha256-XebMzmTkLn+kKa0gAnoSMPmPxbxysfPnes4RQ3hqShc="
|
||||
"hash": "sha256-CuCKFAGgGhq4gKinjZn8bRz0BCJG5GbvW7rSaAXOhJo="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"arch": "darwin-amd64",
|
||||
"hash": "sha256-zz8GObtjDgMWx4HDcwugMWeS/n40/1jPwN/8rXIb5+8="
|
||||
"hash": "sha256-xNvsP6yIH8GI5RLH+jRgZC08Mch2Z1WFsEHIwfcI77A="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }:
|
||||
{ lib, stdenv, fetchFromGitHub, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslh";
|
||||
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = "patchShebangs *.sh";
|
||||
|
||||
buildInputs = [ libcap libev libconfig perl tcp_wrappers pcre2 ];
|
||||
buildInputs = [ libev libconfig perl pcre2 ] ++ lib.optionals stdenv.isLinux [ libcap tcp_wrappers ];
|
||||
|
||||
makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ];
|
||||
makeFlags = lib.optionals stdenv.isLinux [ "USELIBCAP=1" "USELIBWRAP=1" ];
|
||||
|
||||
postInstall = ''
|
||||
# install all flavours
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tt-rss-theme-feedly";
|
||||
version = "3.1.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "levito";
|
||||
repo = "tt-rss-feedly-theme";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sHKht4EXKIibk+McMR+fKv7eZFJsGgZWhfxlLssA/Sw=";
|
||||
sha256 = "sha256-3mD1aY7gjdvucRzY7sLmZ1RsHtraAg1RGE/3uDp6/o4=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Feedly theme for Tiny Tiny RSS";
|
||||
license = licenses.wtfpl;
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/levito/tt-rss-feedly-theme";
|
||||
maintainers = with maintainers; [ das_j ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -10,19 +10,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.48.1";
|
||||
version = "0.48.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BljAzfTm/POxshj34mSjXQl64vxBkQZc8T3cTe95eVA=";
|
||||
hash = "sha256-b7lwy1erESjSg+pPZelYNBfIcbdcfDdM3klefQ6+L00=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-L+UGAg3UERhty3kwksgFojXchr5GzHqULcxJw6Gy2WM=";
|
||||
vendorHash = "sha256-1jznsC6VFUph7AKk86iGAV7GKFoAcA87Ltt4n0EaX4c=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XvNc68pVwqBLthkr3jb578Avpnr1NKT1XWUD4aazBHw=";
|
||||
hash = "sha256-07tp8kfmK/YXfV0Yi4Z27BBAefbdJ0gj2ySq2xDB1nw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-COPEgRqogRkGuJm56n9Cqljr7H8QT0RSKAdnXbHm+nw=";
|
||||
vendorHash = "sha256-33W2xd/T1g65eujTTr0q3gYn9np2iELWBEDAjcefwQc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "url-parser";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "url-parser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g4fpyzDgIf/4kBAfNxLst0KKa+vNSCryljFAW1j8wmc=";
|
||||
hash = "sha256-1KNe2sYr2DtRJGdgqs7JAA788Qa3+Z7iTntCkiJd29I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HOlX8oHktbgnbPkRf9iUMCUpGlbcQwusMMcHJJl2nOs=";
|
||||
vendorHash = "sha256-DAwPYihfOorC61/UhRNNOsOaAjbu8mDBaikGJIOzk6Y=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tgt";
|
||||
version = "1.0.89";
|
||||
version = "1.0.90";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fujita";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sgflHkG4FncQ31+BwcZsp7LRgqeqANCIKGysxUk8aEs=";
|
||||
sha256 = "sha256-C1xrsL7+S+TyMWULVuw7+ZV5hxfhXorScfqndomefRw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "1.0.138";
|
||||
version = "1.0.139";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QygghEMpIoYaIIzINHXKUQmkCdoZdScZLHlIW9sObWk=";
|
||||
sha256 = "sha256-ZFmALMhZPwsea+UWIyGeKh8x9wmMQlNjJ2m1Ym4FOcM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HLqONTd+8kn6nUWEEJTGevJxntnfYEu5e41/wvENZAw=";
|
||||
cargoHash = "sha256-UZMaEqhMNYZHa2UHLtCPK+8XN1Jl54BZmFZn4NB+Nn8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rwc";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leahneukirchen";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-axHBkrbLEcYygCDofhqfIeZ5pv1sR34I5UgFUwVb2rI=";
|
||||
sha256 = "sha256-rB20XKprd8jPwvXYdjIEr3/8ygPGCDAgLKbHfw0EgPk=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyprland-per-window-layout";
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coffebar";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2nc72fP/fw053tCJLqXzEecOoiF28wosJbw81kCilYA=";
|
||||
hash = "sha256-muEM0jRNZ8osuZ6YSyNPFD/2IuXoNbR28It9cKeJwZ4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6cZ9aRrUOUoc9vDyGh9PUiuWnXrGxw/ZyECkh0XwBi0=";
|
||||
cargoHash = "sha256-g7VCjxrf6qP6KcTNhHzFEFwP4EiIRTnjK6n93FGee54=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Per window keyboard layout (language) for Hyprland wayland compositor";
|
||||
|
||||
@ -10975,7 +10975,7 @@ with pkgs;
|
||||
mole = callPackage ../tools/networking/mole { };
|
||||
|
||||
morgen = callPackage ../applications/office/morgen {
|
||||
electron = electron_25; # blank screen with electron_26
|
||||
electron = electron_28;
|
||||
};
|
||||
|
||||
mosh = callPackage ../tools/networking/mosh { };
|
||||
@ -16616,7 +16616,7 @@ with pkgs;
|
||||
lld_16 = llvmPackages_16.lld;
|
||||
lld_17 = llvmPackages_17.lld;
|
||||
|
||||
lldb = lldb_14;
|
||||
lldb = llvmPackages.lldb;
|
||||
lldb_6 = llvmPackages_6.lldb;
|
||||
lldb_8 = llvmPackages_8.lldb;
|
||||
lldb_9 = llvmPackages_9.lldb;
|
||||
@ -32895,9 +32895,7 @@ with pkgs;
|
||||
|
||||
istioctl = callPackage ../applications/networking/cluster/istioctl { };
|
||||
|
||||
bip = callPackage ../applications/networking/irc/bip {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
bip = callPackage ../applications/networking/irc/bip { };
|
||||
|
||||
j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { };
|
||||
|
||||
|
||||
@ -194,6 +194,7 @@ mapAliases ({
|
||||
hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
|
||||
hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
hglib = python-hglib; # added 2023-10-13
|
||||
homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05
|
||||
HTSeq = htseq; # added 2023-02-19
|
||||
hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
|
||||
ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08
|
||||
|
||||
@ -5185,8 +5185,6 @@ self: super: with self; {
|
||||
|
||||
home-assistant-chip-core = callPackage ../development/python-modules/home-assistant-chip-core { };
|
||||
|
||||
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
|
||||
|
||||
homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { };
|
||||
|
||||
homeconnect = callPackage ../development/python-modules/homeconnect { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user