Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-05-09 12:01:21 +00:00 committed by GitHub
commit f496548573
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
51 changed files with 298 additions and 215 deletions

View File

@ -53,7 +53,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- `system.etc.overlay.enable` option was added. If enabled, `/etc` is
mounted via an overlayfs instead of being created by a custom perl script.
- For each supporting version of the Linux kernel firmware blobs and kernel modules
- For each supporting version of the Linux kernel firmware blobs
are compressed with zstd. For firmware blobs this means an increase of 4.4% in size, however
a significantly higher decompression speed.

View File

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "10.71";
version = "10.72";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
hash = "sha256-YHPC+dHfvRSr6GldWSlgCGt/wuO/WXQGRliarnM8/AU=";
hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ=";
stripRoot = false;
};
nativeBuildInputs = [

View File

@ -69,7 +69,7 @@ let
patches = (oldAttrs.patches or []) ++ [
(fetchpatch {
url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch";
hash = "sha256-H45/YF9zaOUg6UqEEus4uBeGA/TjynuJZcRyc6BHQ30=";
hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4=";
})
];
});

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "offat";
version = "0.17.3";
version = "0.17.5";
pyproject = true;
src = fetchFromGitHub {
owner = "OWASP";
repo = "OFFAT";
rev = "refs/tags/v${version}";
hash = "sha256-q9xqtJJ9R81tNvd5Z6S4OWMqDwVoijntw2LOXldVy0E=";
hash = "sha256-61VJPsmSvKZKBWQNl7klqZqFjEjhM3n4LuafZh4d6g4=";
};
sourceRoot = "${src.name}/src";

View File

@ -48,14 +48,14 @@ let
]);
path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ];
in stdenv.mkDerivation rec {
version = "4.3.0";
version = "4.3.1";
pname = "sabnzbd";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-2zRhDFKbWq4JA7XE5/VFbfkN2ZQcqcuqGD5kjHmeXUA=";
sha256 = "sha256-OlACGAYP4nMZZAVJduzj0AGTzSwM+lE7+H2xgmQVSWg=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,7 +2,7 @@
stdenvNoCC.mkDerivation rec {
pname = "scheme-manpages";
version = "unstable-2024-02-11";
version = "0-unstable-2024-02-11";
src = fetchFromGitHub {
owner = "schemedoc";

View File

@ -2,7 +2,7 @@
let
themeName = "Dracula";
version = "unstable-2024-04-24";
version = "4.0.0-unstable-2024-04-24";
in
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
@ -38,7 +38,9 @@ stdenvNoCC.mkDerivation {
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
};
meta = with lib; {
description = "Dracula variant of the Ant theme";

View File

@ -17,7 +17,7 @@
mkDerivation rec {
pname = "material-kwin-decoration";
version = "unstable-2023-01-15";
version = "7-unstable-2023-01-15";
src = fetchFromGitHub {
owner = "Zren";
@ -47,7 +47,9 @@ mkDerivation rec {
];
passthru = {
updateScript = unstableGitUpdater { };
updateScript = unstableGitUpdater {
tagPrefix = "v";
};
};
meta = with lib; {

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation {
name = "nixos-bgrt-plymouth";
version = "unstable-2023-03-10";
version = "0-unstable-2023-03-10";
src = fetchFromGitHub {
repo = "plymouth-theme-nixos-bgrt";

View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "file-roller-contract";
version = "unstable-2021-02-22";
version = "0-unstable-2021-02-22";
src = fetchFromGitHub {
owner = "elementary";

View File

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-ayatana";
version = "unstable-2023-04-18";
version = "2.0.7-unstable-2023-04-18";
src = fetchFromGitHub {
owner = "Lafydev";

View File

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "c0";
version = "unstable-2023-09-05";
version = "0-unstable-2023-09-05";
src = fetchFromBitbucket {
owner = "c0-lang";

View File

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "${passthru.prettyName}-unwrapped";
# nixpkgs-update: no auto update
version = "unstable-2023-11-24";
version = "0-unstable-2023-11-24";
src = fetchFromGitHub {
owner = "open-watcom";
@ -89,6 +89,8 @@ stdenv.mkDerivation rec {
prettyName = "open-watcom-v2";
updateScript = unstableGitUpdater {
url = "https://github.com/open-watcom/open-watcom-v2.git";
# no numerical releases, monthly "YYYY-MM-DD-Build" tags and daily "Current-build", "Last-CI-build" & "Coverity-scan" retagging
hardcodeZeroVersion = true;
};
};

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zig-shell-completions";
version = "unstable-2023-11-18";
version = "0-unstable-2023-11-18";
src = fetchFromGitHub {
owner = "ziglang";

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation {
pname = "femtolisp";
version = "unstable-2023-07-12";
version = "0-unstable-2023-07-12";
src = fetchFromSourcehut {
owner = "~ft";

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "nelua";
version = "unstable-2024-04-20";
version = "0-unstable-2024-04-20";
src = fetchFromGitHub {
owner = "edubart";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace lualib/nelua/version.lua \
--replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \
--replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "unstable-" version}'"
--replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'"
'';
makeFlags = [ "PREFIX=$(out)" ];
@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
doCheck = true;
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
# no releases, only stale "latest" tag
hardcodeZeroVersion = true;
};
meta = with lib; {
description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code";

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpp-utilities";
version = "5.24.7";
version = "5.24.8";
src = fetchFromGitHub {
owner = "Martchus";
repo = "cpp-utilities";
rev = "v${finalAttrs.version}";
sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY=";
sha256 = "sha256-Bo7XYArkJOK/dsX+K+xadz8SCh736ZMaB29jX4X+RGw=";
};
nativeBuildInputs = [ cmake ];

View File

@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "aiomisc";
version = "17.5.6";
version = "17.5.15";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-oq4z+ULN6VYkXX4Oz/JqKZSIh55AHOxFJVLyaNGqaNA=";
hash = "sha256-tfJm0W20UeuWIrihXpEmbiX5+Zs1ASIzJbhjodLdctI=";
};
build-system = [ poetry-core ];

View File

@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, gensim
, numpy
, pandas
, pyfume
, scipy
, pythonOlder
{
lib,
buildPythonPackage,
fetchPypi,
gensim,
numpy,
pandas,
pyfume,
setuptools,
scipy,
pythonOlder,
}:
buildPythonPackage rec {
pname = "fuzzytm";
version = "2.0.5";
format = "setuptools";
version = "2.0.9";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "FuzzyTM";
inherit version;
hash = "sha256-IELkjd3/yc2lBYsLP6mms9LEcXOfVtNNooEKCMf9BtU=";
hash = "sha256-z0ESYtB7BqssxIHlrd0F+/qapOM1nrDi3Zih5SvgDGY=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
gensim
numpy
pandas
@ -33,9 +37,7 @@ buildPythonPackage rec {
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"FuzzyTM"
];
pythonImportsCheck = [ "FuzzyTM" ];
meta = with lib; {
description = "Library for Fuzzy Topic Models";

View File

@ -1,25 +1,26 @@
{ lib
, beautifulsoup4
, buildPythonPackage
, click
, dataclasses-json
, fetchFromGitHub
, htmlmin
, jinja2
, markdown2
, poetry-core
, pygments
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, pytz
, pyyaml
, requests
{
lib,
beautifulsoup4,
buildPythonPackage,
click,
dataclasses-json,
fetchFromGitHub,
htmlmin,
jinja2,
markdown2,
poetry-core,
pygments,
pytestCheckHook,
pythonOlder,
pythonRelaxDepsHook,
pytz,
pyyaml,
requests,
}:
buildPythonPackage rec {
pname = "json-schema-for-humans";
version = "0.47";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -28,19 +29,16 @@ buildPythonPackage rec {
owner = "coveooss";
repo = "json-schema-for-humans";
rev = "refs/tags/v${version}";
hash = "sha256-yioYsCp+q5YWdIWDlNZkpaLqo++n+dV5jyEeIhUDHr4=";
hash = "sha256-ZlGIttfFOL4uLgzXIFvmyFDGrm8/Vr94QaFSn4/5ITI=";
};
pythonRelaxDeps = [
"dataclasses-json"
];
pythonRelaxDeps = [ "dataclasses-json" ];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
build-system = [ poetry-core ];
propagatedBuildInputs = [
nativeBuildInputs = [ pythonRelaxDepsHook ];
dependencies = [
click
dataclasses-json
htmlmin
@ -64,16 +62,14 @@ buildPythonPackage rec {
"TestMdGenerate"
];
pythonImportsCheck = [
"json_schema_for_humans"
];
pythonImportsCheck = [ "json_schema_for_humans" ];
meta = with lib; {
description = "Quickly generate HTML documentation from a JSON schema";
mainProgram = "generate-schema-doc";
homepage = "https://github.com/coveooss/json-schema-for-humans";
changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ astro ];
mainProgram = "generate-schema-doc";
};
}

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20240506";
version = "0.10.0.20240508";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gg1UcELZ8+gQg4VcBsagHhtUc9i6/d03q9oanyDT6K8=";
hash = "sha256-DnDamv29WeYYL6FFDxfxFWRGYUvmNemorW+DlvoEM64=";
};
build-system = [ setuptools ];

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "pyenphase";
version = "1.20.2";
version = "1.20.3";
pyproject = true;
disabled = pythonOlder "3.11";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "pyenphase";
repo = "pyenphase";
rev = "refs/tags/v${version}";
hash = "sha256-sjZaLqTYoXJ1cpaSuyLNAsUrACOMVah7DKaKxGkG0zE=";
hash = "sha256-4lMsyzw56gFimUs52mEzy5eKYF9s2ClNi3yfdIBbccY=";
};
postPatch = ''

View File

@ -1,24 +1,25 @@
{ lib
, aiohttp
, aresponses
, awesomeversion
, backoff
, buildPythonPackage
, cachetools
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytest-freezegun
, pytestCheckHook
, pythonOlder
, xmltodict
, yarl
{
lib,
aiohttp,
aresponses,
awesomeversion,
backoff,
buildPythonPackage,
cachetools,
fetchFromGitHub,
poetry-core,
pytest-asyncio,
pytest-freezegun,
pytestCheckHook,
pythonOlder,
xmltodict,
yarl,
}:
buildPythonPackage rec {
pname = "rokuecp";
version = "0.19.2";
format = "pyproject";
version = "0.19.3";
pyproject = true;
disabled = pythonOlder "3.9";
@ -26,14 +27,18 @@ buildPythonPackage rec {
owner = "ctalkington";
repo = "python-rokuecp";
rev = "refs/tags/${version}";
hash = "sha256-L6uedckc2lEQ6CUlQGEyDhnuVsxRRgDQJUEsZTfm2sU=";
hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM=";
};
nativeBuildInputs = [
poetry-core
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"' \
--replace-fail "--cov" ""
'';
propagatedBuildInputs = [
build-system = [ poetry-core ];
dependencies = [
aiohttp
backoff
cachetools
@ -49,12 +54,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace "--cov" ""
'';
disabledTests = [
# Network related tests are having troube in the sandbox
"test_resolve_hostname"
@ -66,9 +65,7 @@ buildPythonPackage rec {
"test_get_tv_channels_single_channel"
];
pythonImportsCheck = [
"rokuecp"
];
pythonImportsCheck = [ "rokuecp" ];
meta = with lib; {
description = "Asynchronous Python client for Roku (ECP)";

View File

@ -1,25 +1,25 @@
{ lib
, buildPythonPackage
, dateparser
, defusedxml
, fetchFromGitHub
, fiona
, geomet
, geopandas
, kml2geojson
, pyshp
, pythonOlder
, pyyaml
, regex
, requests
, shapely
, scikit-learn
{
lib,
buildPythonPackage,
dateparser,
defusedxml,
fetchFromGitHub,
geomet,
geopandas,
kml2geojson,
pyshp,
pythonOlder,
pyyaml,
requests,
setuptools-scm,
shapely,
scikit-learn,
}:
buildPythonPackage rec {
pname = "wktutils";
version = "1.1.6";
format = "setuptools";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -27,39 +27,43 @@ buildPythonPackage rec {
owner = "asfadmin";
repo = "Discovery-WKTUtils";
rev = "refs/tags/v${version}";
hash = "sha256-PFeIMIFOff9ztdmIP7jcFzKkmhm01G0QnDm20AafUsg=";
hash = "sha256-mB+joEZq/aFPcRqFAzPgwG26Wi7WiRCeQeFottk+4Ho=";
};
propagatedBuildInputs = [
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail '"twine",' ""
'';
build-system = [ setuptools-scm ];
dependencies = [
dateparser
defusedxml
fiona
geomet
geopandas
kml2geojson
pyshp
pyyaml
regex
requests
shapely
scikit-learn
];
postPatch = ''
substituteInPlace setup.py \
--replace "sklearn" "scikit-learn"
'';
passthru.optional-dependencies = {
extras = [
requests
scikit-learn
];
};
# Module doesn't have tests
doCheck = false;
pythonImportsCheck = [
"WKTUtils"
];
pythonImportsCheck = [ "WKTUtils" ];
meta = with lib; {
description = "Collection of tools for handling WKTs";
homepage = "https://github.com/asfadmin/Discovery-WKTUtils";
changelog = "https://github.com/asfadmin/Discovery-WKTUtils/blob/v${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
version = "0.29.0";
version = "0.29.2";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = version;
hash = "sha256-eLLnSfuFnvlarpFBkhq3eumIyXOuuYU9ZJHpsKt0WQE=";
hash = "sha256-3OLMTiMX5dsW691MX432YUuVqKOtrmS6Tpk96QVEyo8=";
};
cargoHash = "sha256-bTflBJ5Rz2Xdip2ptUyGi+CpR0ZN0ggVutSk1S9nW1c=";
cargoHash = "sha256-+xCA0LVEHhBGOgMx+/ABZL1I7NSJEWf21p9gmQJNBJo=";
nativeBuildInputs = [
pkg-config

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-whatfeatures";
version = "0.9.11";
version = "0.9.12";
src = fetchFromGitHub {
owner = "museun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lCS0EDSNnCii98OBZlPwwq7LBociN7zo8FZJvxt9X4w=";
sha256 = "sha256-62eEHxX+Gsz+Bif1ev0nTRituRkfqlGYZfa9cFkO26M=";
};
cargoHash = "sha256-SNhulId9naSBO7UxiiX7q0RIVJngflAO2UfpxvKDIF4=";
cargoHash = "sha256-bk/mbQu4lzhA9ct7cws70MYuj8oNEBgC+0EjHlaN1lc=";
nativeBuildInputs = [ pkg-config ];

View File

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "slade";
version = "unstable-2023-09-30";
version = "3.2.4-unstable-2023-09-30";
src = fetchFromGitHub {
owner = "sirjuddington";

View File

@ -98,6 +98,7 @@ let
desktopName = "Mindustry";
exec = "mindustry";
icon = "mindustry";
categories = [ "Game" ];
};
cleanupMindustrySrc = ''

View File

@ -15,7 +15,7 @@
buildPythonApplication rec {
pname = "nile";
version = "unstable-2024-03-09";
version = "1.0.2-unstable-2024-03-09";
format = "pyproject";
src = fetchFromGitHub {
@ -56,5 +56,7 @@ buildPythonApplication rec {
maintainers = with maintainers; [ aidalgol ];
};
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
};
}

View File

@ -951,8 +951,7 @@ let
ZEROPLUS_FF = yes;
MODULE_COMPRESS = whenOlder "5.13" yes;
MODULE_COMPRESS_XZ = whenOlder "5.13" yes;
MODULE_COMPRESS_ZSTD = whenAtLeast "5.13" yes;
MODULE_COMPRESS_XZ = yes;
SYSVIPC = yes; # System-V IPC

View File

@ -5,22 +5,22 @@ let
name = repo;
owner = "tbsdtv";
repo = "linux_media";
rev = "d0a7e44358f28064697e0eed309db03166dcd83b";
hash = "sha256-BTHlnta5qv2bdPjD2bButwYGpwR/bq99/AUoZqTHHYw=";
rev = "d8d1ff33c0c47e34fe3e860b52b4d6c457520866";
hash = "sha256-1Z9itZ5GFpfUeRtp5xTnS+I91LUZLDhsEcF2v8ThaCs=";
};
build = fetchFromGitHub rec {
name = repo;
owner = "tbsdtv";
repo = "media_build";
rev = "88764363a3e3d36b3c59a0a2bf2244e262035d47";
hash = "sha256-LFTxYVPudflxqYTSBIDNkTrGs09MOuYBXwpGYqWfEFQ=";
rev = "8cd12a6e90999f3a341018812a5d66d7e6b30913";
hash = "sha256-+I0NrML54ni37qgDHbRUQiLmmw/UZgXmoFoiDNDeH5A=";
};
in
stdenv.mkDerivation {
pname = "tbs";
version = "20231210-${kernel.version}";
version = "20240506-${kernel.version}";
srcs = [ media build ];
sourceRoot = build.name;
@ -66,6 +66,6 @@ stdenv.mkDerivation {
license = licenses.gpl2;
maintainers = with maintainers; [ ck3d ];
priority = -1;
broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.6";
broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.9";
};
}

View File

@ -6,7 +6,7 @@
buildGoModule {
pname = "bloat";
version = "unstable-2024-02-12";
version = "0-unstable-2024-02-12";
src = fetchgit {
url = "git://git.freesoftwareextremist.com/bloat";

View File

@ -1,25 +1,26 @@
{ lib
, fetchFromGitHub
, fetchYarnDeps
, mkYarnPackage
{
lib,
fetchFromGitHub,
fetchYarnDeps,
mkYarnPackage,
}:
mkYarnPackage rec {
pname = "zigbee2mqtt-networkmap";
version = "unstable-2023-12-16";
version = "0.9.0";
src = fetchFromGitHub {
owner = "azuwis";
repo = "zigbee2mqtt-networkmap";
rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3";
hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos=";
rev = "v${version}";
hash = "sha256-K4DyrurC4AzzJCcB4CS9UlQbUQSWpR7PevA2JFFMRZM=";
};
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs=";
hash = "sha256-h/5TWaIg8AfY6I/JBRmUF6yCCbxCMs9nRECWEaaK2to=";
};
configurePhase = ''
@ -49,8 +50,10 @@ mkYarnPackage rec {
doDist = false;
passthru.entrypoint = "zigbee2mqtt-networkmap.js";
passthru.updateScript = ./update.sh;
meta = with lib; {
changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${version}";
description = "Home Assistant Custom Card to show Zigbee2mqtt network map";
homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap";
maintainers = with maintainers; [ azuwis ];

View File

@ -0,0 +1,9 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
set -xe
dirname="$(dirname "$0")"
# nix-update picks the wrong file `pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix`
nix-update --override-filename "$dirname/default.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap

View File

@ -387,6 +387,46 @@ let
};
});
# newer sigstore version transitivevly require pydantic>=2
sigstore = super.sigstore.overridePythonAttrs (oldAttrs: rec {
version = "1.1.2";
src = fetchFromGitHub {
owner = "sigstore";
repo = "sigstore-python";
rev = "refs/tags/v${version}";
hash = "sha256-QqY5GOBS75OkbSaF5Ua5jnJAhsYfVRuWLUoWDxX8Ino=";
};
dependencies = with self; [
appdirs
cryptography
id
pydantic
pyjwt
pyopenssl
requests
securesystemslib
sigstore-protobuf-specs
tuf
];
doCheck = false; # pytest too new
});
sigstore-protobuf-specs = super.sigstore-protobuf-specs.overridePythonAttrs {
version = "0.1.0";
src = fetchPypi {
pname = "sigstore-protobuf-specs";
version = "0.1.0";
hash = "sha256-YistIxYToo7T5mYKzYeBhnW06DSG9JoPDBmKxUdfy4E=";
};
nativeBuildInputs = with self; [
flit-core
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"betterproto"
];
};
tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec {
version = "0.5.1";
src = fetchFromGitHub {
@ -397,6 +437,19 @@ let
};
});
tuf = super.tuf.overridePythonAttrs rec {
version = "2.1.0";
src = fetchFromGitHub {
owner = "theupdateframework";
repo = "python-tuf";
rev = "refs/tags/v${version}";
hash = "sha256-MdPctAZuKn/YAwpMJ5gWU7PXJD3iK7bYprLXV52wNQQ=";
};
disabledTests = [
"test_sign_failures"
];
};
versioningit = super.versioningit.overridePythonAttrs {
doCheck = false;
};

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2024.5.1";
version = "2024.5.2";
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-lYoYU39/ayZb8Ue25a7uSN5x8tihzjj5mGaVKWPfa1w=";
hash = "sha256-bgXHEz8YuHcdGYzLpM7H8IVXixFC8Bz0i4SaatA49Qo=";
};
nativeBuildInputs = [

View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2024-04-20";
version = "0.12.0-unstable-2024-04-20";
src = fetchFromGitHub {
owner = "KevinOConnor";
@ -63,7 +63,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { url = meta.homepage; };
passthru.updateScript = unstableGitUpdater {
url = meta.homepage;
tagPrefix = "v";
};
meta = with lib; {
description = "The Klipper 3D printer firmware";

View File

@ -24,7 +24,7 @@ let
);
in stdenvNoCC.mkDerivation rec {
pname = "moonraker";
version = "unstable-2023-12-27";
version = "0.8.0-unstable-2023-12-27";
src = fetchFromGitHub {
owner = "Arksine";
@ -44,7 +44,10 @@ in stdenvNoCC.mkDerivation rec {
'';
passthru = {
updateScript = unstableGitUpdater { url = meta.homepage; };
updateScript = unstableGitUpdater {
url = meta.homepage;
tagPrefix = "v";
};
tests.moonraker = nixosTests.moonraker;
};

View File

@ -19,7 +19,7 @@ buildGoModule rec {
substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty"
'';
vendorHash = "sha256-mt2L5vf57/MntjtfJVua799nF4CkRYI8payLoPc0oQA=";
vendorHash = "sha256-ogJ/FwWJt1L0NGKX29tqWmHo4WslzC7ck5r7vn5PEuY=";
subPackages = [ "cmd/photoprism" ];

View File

@ -1,14 +1,14 @@
{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }:
let
version = "231128-f48ff16ef";
version = "240420-ef5f14bc4";
pname = "photoprism";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-gVxKa5JKGz5VSVCuJHat0DWCYaUH+9an6JsYUPe9muQ=";
hash = "sha256-oJRd4eTwoTYKAJAsG9y0mnG+zF+eeLlSXNgaKLcb43w=";
};
libtensorflow = pkgs.callPackage ./libtensorflow.nix { };

View File

@ -8,7 +8,7 @@ buildNpmPackage {
cd frontend
'';
npmDepsHash = "sha256-4bAWSSy7kvG1ChzEb2iuxgWxnkjtJlr7Lm7USbgsmAw=";
npmDepsHash = "sha256-mgDg6awsEHkZyMzvFLwlfXGjdvjtwkNJiiNcnRBSJVo=";
installPhase = ''
runHook preInstall

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "spicedb";
version = "1.31.0";
version = "1.32.0";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
hash = "sha256-xbYK+9wTsOIh8fpgbL63JmDzsXFmfPa0TKS06hmwLAg=";
hash = "sha256-PIl5FmXWyp6mkSzTQe7hu4aWeQgGa1YrC5+t1eMQhPY=";
};
vendorHash = "sha256-RBQfrz74Fzse9Rjj6DGfMttbupfSFjP5KbxFHihwMKY=";
vendorHash = "sha256-LrNoIknYY9XIwdyUq7f5pG0IU0WZVSgTNMTFoZAIhp8=";
subPackages = [ "cmd/spicedb" ];

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "pgjwt";
version = "unstable-2023-03-02";
version = "0-unstable-2023-03-02";
src = fetchFromGitHub {
owner = "michelp";

View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "tds_fdw";
# Move to stable version when it's released.
version = "unstable-2024-02-10";
version = "2.0.3-unstable-2024-02-10";
buildInputs = [ postgresql freetds ];
@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
install -D tds_fdw.control -t $out/share/postgresql/extension
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = unstableGitUpdater {
tagPrefix = "v";
};
meta = with lib; {
description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)";

View File

@ -9,7 +9,7 @@
rustPlatform.buildRustPackage {
pname = "nu-plugin-net";
version = "unstable-2024-04-05";
version = "0-unstable-2024-04-05";
src = fetchFromGitHub {
owner = "fennewald";
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
hash = "sha256-uKLYTRR2tThSvwWbvEePOLZ9ehNPfCYruZxTKSIxpEA=";
};
cargoHash = "sha256-2A9RalZhXigLq/6w738G6PnkV3FyK+3HHXPDQRHTIm0=";
cargoHash = "sha256-BsCOej31vfTf+Wca4+AjxkhXz6wpMRFJmGBsUqOj2U0=";
nativeBuildInputs = [
rustPlatform.bindgenHook

View File

@ -8,7 +8,7 @@
stdenv.mkDerivation {
pname = "rc-9front";
version = "unstable-2022-11-01";
version = "0-unstable-2022-11-01";
src = fetchFrom9Front {
domain = "shithub.us";

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "zsh-prezto";
version = "unstable-2024-04-15";
version = "0-unstable-2024-04-15";
src = fetchFromGitHub {
owner = "sorin-ionescu";

View File

@ -7,7 +7,7 @@
let
pname = "liquidsoap";
version = "2.2.4";
version = "2.2.5";
in
stdenv.mkDerivation {
inherit pname version;
@ -16,7 +16,7 @@ stdenv.mkDerivation {
owner = "savonet";
repo = "liquidsoap";
rev = "refs/tags/v${version}";
hash = "sha256-aAW3PeobTRVi5mV321MHZ6RymvOY4DbZITjwcMwGwFo=";
hash = "sha256-o3P7oTizO2l2WkB4LormZ/Ses5jZOpgQ1r1zB1Y3Bjs=";
};
postPatch = ''
@ -129,12 +129,13 @@ stdenv.mkDerivation {
ocamlPackages.yaml
];
meta = with lib; {
meta = {
description = "Swiss-army knife for multimedia streaming";
mainProgram = "liquidsoap";
homepage = "https://www.liquidsoap.info/";
maintainers = with maintainers; [ dandellion ehmry ];
license = licenses.gpl2Plus;
changelog = "https://raw.githubusercontent.com/savonet/liquidsoap/main/CHANGES.md";
maintainers = with lib.maintainers; [ dandellion ehmry ];
license = lib.licenses.gpl2Plus;
platforms = ocamlPackages.ocaml.meta.platforms or [];
};
}

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "tbls";
version = "1.74.1";
version = "1.74.3";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
rev = "v${version}";
hash = "sha256-QuusOxXcTp7c6zkj6L//jOXWwLUgrsUFtsUtrNZrkOk=";
hash = "sha256-tS/sdX74Fr6arZh7/JiNFz1grjPMVZfg8C1VvqxsbYM=";
};
vendorHash = "sha256-mDZOBwm3k3L4QqQA+1C3jRz46R7+4wwJg9BVNWB0F0A=";
vendorHash = "sha256-NafHcWP9xJX2hy8i1TKtBi54cXDKgoxbgwLQjYRBcjU=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.bitwizard.nl/mtr/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ koral orivej raskin globin ];
mainProgram = "mtr";
platforms = platforms.unix;
};
}

View File

@ -1,38 +1,33 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, git
, installShellFiles
, kubescape
, testers
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
git,
installShellFiles,
kubescape,
testers,
}:
buildGoModule rec {
pname = "kubescape";
version = "3.0.9";
version = "3.0.10";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
rev = "refs/tags/v${version}";
hash = "sha256-pAe289XwKq/PO39/Wt60uipt4Z0ZD5f73pDaOTXXwi0=";
hash = "sha256-r6w2Cfyjxqf/1DMBGgmE8Oh/WnvBOa7mAEGXnPjk1Pg=";
fetchSubmodules = true;
};
vendorHash = "sha256-UWmsS79N8ooFr4qpKqOVC14cgf5ckAQwzROHGl1smD8=";
vendorHash = "sha256-WPa6IKPjdBtoHYKA2yYtaI1LCbkyv374fcThxbSEKxo=";
subPackages = [
"."
];
subPackages = [ "." ];
nativeBuildInputs = [
installShellFiles
];
nativeBuildInputs = [ installShellFiles ];
nativeCheckInputs = [
git
];
nativeCheckInputs = [ git ];
ldflags = [
"-s"
@ -89,7 +84,10 @@ buildGoModule rec {
Jenkins, CircleCI and Github workflows.
'';
license = licenses.asl20;
maintainers = with maintainers; [ fab jk ];
maintainers = with maintainers; [
fab
jk
];
mainProgram = "kubescape";
broken = stdenv.isDarwin;
};