diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ba831d44d31..4c7c71418d63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11556,6 +11556,13 @@ name = "Noah Fontes"; keys = [ { fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; } ]; }; + implr = { + email = "bartoszstebel@gmail.com"; + matrix = "@implr:hackerspace.pl"; + github = "implr"; + githubId = 2821175; + name = "Bartosz Stebel"; + }; imrying = { email = "philiprying@gmail.com"; github = "imrying"; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 7c5fdc28720d..75cf07bf2e07 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { install -Dpm755 -D diffpdf $out/bin/diffpdf install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1 - install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications + install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/applications install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/ install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/ install -Dpm644 images/icon.png $out/share/icons/hicolor/64x64/apps/diffpdf.png @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { Name=diffpdf Icon=diffpdf Comment=PDF diffing tool - Exec=$out/bin/diffpdf + Exec=diffpdf Terminal=false EOF ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 994df17ef1b2..c0b65b74389b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -824,13 +824,13 @@ "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU=" }, "kreuzwerker_docker": { - "hash": "sha256-PW221bf3/EL3uCjkrJuLymFcrFAkx/5qvEVzFvuCCIk=", + "hash": "sha256-wC0XYOGx3CBrXOkISmYFMMqcNijl3u2XZzrVOPF+EDo=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v4.2.0", + "rev": "v4.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SJUlHerlt7Z3g1UJ7QKoCwEYolKL7SZp2O537poje3I=" + "vendorHash": "sha256-PIltVJ3o3ROFi1ensrJyFYEsCm6nEFXHkkTPU3ho+gU=" }, "launchdarkly_launchdarkly": { "hash": "sha256-DCc+qQdVVDdFiHaDv6jc4MUuWPemk3XEeBEKAbTUi7M=", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index fdfc98ec784a..93b19218efa4 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -174,9 +174,9 @@ confcom = mkAzExtension rec { pname = "confcom"; - version = "2.0.0b2"; + version = "2.0.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - hash = "sha256-1j1ASDf/g4eSixhvxBFCS4yPiX8QG/+x7IC07g5aLfw="; + hash = "sha256-Nol3gbwgq76ijbmRyfV64kcArqeCk4/riBr4FxAeNtk="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index 3a1f25d3a62e..0814140278c0 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -20,13 +20,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.2.6"; + version = "0.2.8"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-aGm/SiHogz9LSK2LQkEOkeQWBVOHDRvUK0YEU9Tuznw="; + hash = "sha256-Opc/SsDp5cPMnErZkOV7k5nFdGqy2EgGJNbEXx88kZY="; }; bazelFlags = [ diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 3a2554096ac3..2a869721785f 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.17.6-1"; - arm64-hash = "sha256-QAqxs8Jyu4kA8Zmox0GJ8KoPS/L5z3TTtP6JDk62zjk="; - x86_64-hash = "sha256-Lit/eIudO0V1USoP0VWHbR5QHCT+7RyX9omYM4PoCeQ="; + version = "1.17.6-2"; + arm64-hash = "sha256-uJjVcwkbYiTdV9Ki/ur1/xZuKUCUFefRXIPSRlgRaoA="; + x86_64-hash = "sha256-vAKAYCbwS92Nqk0W+dN/GeYOcori4MY5e16mMDLfXPk="; } diff --git a/pkgs/by-name/cr/crimson/package.nix b/pkgs/by-name/cr/crimson/package.nix index 3a9233f7d8fc..4d4c4957ef88 100644 --- a/pkgs/by-name/cr/crimson/package.nix +++ b/pkgs/by-name/cr/crimson/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,13 +16,15 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-Wp9L77q93TRmrAr0P4iH9gm0tqFY0X/xSsuFcd19aAE="; }; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf - install -m444 -Dt $out/share/doc/${pname}-${version} README.md + nativeBuildInputs = [ installFonts ]; - runHook postInstall + postInstall = '' + install -m444 -Dt $out/share/doc/${pname}-${version} README.md ''; meta = { diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index abd4fe455cc5..1fa120250a5a 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "dotenvx"; - version = "1.65.0"; + version = "1.66.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${finalAttrs.version}"; - hash = "sha256-+THGA+EQcfx+s/PDb+xTgsrZBtn8m1im1H4sfJ6vPDs="; + hash = "sha256-dW/7dD24zCyGwKf6QDtT6WRglHJwJwI+peiPdmdxoOQ="; }; - npmDepsHash = "sha256-SHGJDpuGuuBXKwppZPM43r7Ae8PSegz3ld+M2WlDQi0="; + npmDepsHash = "sha256-jDqlcRMU2nzL4l1N/cFhYFpXOur9+RH4JFb7Sgdd7wU="; dontNpmBuild = true; diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 33938de14a40..af407ccc4abb 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -9,10 +9,10 @@ }: let - version = "2.8.6"; - srcHash = "sha256-pKP4g2pTMYtx/B/Y3ow7tvDdhCSuwbszzeLVXB0W7Bo="; - vendorHash = "sha256-VBafft9/AuXaHWvZymy7P9gaSuO8D6IZHfK68Ixp3mI="; - manifestsHash = "sha256-h/HR/rJwPWXiuoj9T+LajdsdT4Jo8/EuN+O1I7e9sjI="; + version = "2.8.7"; + srcHash = "sha256-aA4DA/uG/YZ/9cUWAhhVZJme8Cj7OWFWqXce8n5InfM="; + vendorHash = "sha256-kn0S5tycL6tpgy/0YrHSFM0WpUluugSy87rh1FArnO8="; + manifestsHash = "sha256-pYz+UNYnBYSIFdWbK9bcckJhgCMGm8EZDC/DXtXNwDE="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 2b6eae3dc87e..93d75f67c8bf 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "flyctl"; - version = "0.4.49"; + version = "0.4.52"; src = fetchFromGitHub { owner = "superfly"; @@ -22,11 +22,11 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-WOk4zIWZbf3s4jPzeHANxHAOZvnnm3ENdGluSuM90WM="; + hash = "sha256-WiDCC5oy/4/CjgAQh9Q4MzLiHTjadxdQH3OExhwmWRU="; }; proxyVendor = true; - vendorHash = "sha256-395vcBQYvc3LUQSPGtJ1x6RIhUmkR6Y/wGFCD3vrMcE="; + vendorHash = "sha256-zy6LITMZ4WvXbSzbFRaRljWbnl5GFykU/gJtgO8iIrw="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ge/gearboy/package.nix b/pkgs/by-name/ge/gearboy/package.nix index 831dd4ae0464..2cbc8b2c277f 100644 --- a/pkgs/by-name/ge/gearboy/package.nix +++ b/pkgs/by-name/ge/gearboy/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gearboy"; - version = "3.8.3"; + version = "3.8.4"; src = fetchFromGitHub { owner = "drhelius"; repo = "Gearboy"; tag = finalAttrs.version; - hash = "sha256-3wyAwK61lusmVYbt9m10H4I4KUHAUAlC0bP9LqGB/OE="; + hash = "sha256-wgiUHOL55P9N/wXMy8ZOPq4KcAomPJoWEwukXuYRbGo="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ge/geist-font/package.nix b/pkgs/by-name/ge/geist-font/package.nix index f3445bea363a..9bcbdf051735 100644 --- a/pkgs/by-name/ge/geist-font/package.nix +++ b/pkgs/by-name/ge/geist-font/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -17,13 +18,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceRoot = "."; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -D source/fonts/{Geist,GeistMono}/otf/*.otf -t $out/share/fonts/opentype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Font family created by Vercel in collaboration with Basement Studio"; diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index c5366b3c7fdd..e35506ef8ec3 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ${finalAttrs.src} $out/share/java/gpsprune.jar makeWrapper ${jre}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" - mkdir -p $out/share/pixmaps + mkdir -p $out/share/icons/hicolor/64x64/apps ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/icons/hicolor/64x64/apps/gpsprune.png runHook postInstall diff --git a/pkgs/by-name/ja/jack-link/package.nix b/pkgs/by-name/ja/jack-link/package.nix index 9d0368f0fa89..36fbed51ef5c 100644 --- a/pkgs/by-name/ja/jack-link/package.nix +++ b/pkgs/by-name/ja/jack-link/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jack-link"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "rncbc"; repo = "jack_link"; tag = "v${finalAttrs.version}"; - hash = "sha256-mZ74nkiAQHkJAZYHTsNcQnrisaUIyHwEDUbrvOL6CAU="; + hash = "sha256-FaFFKcTB70UDWtst7A2JeqzSgVGDkkaRhZS3II56ndU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index 8a93c8d10d75..0ff4192c4245 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luanti"; - version = "5.15.2"; + version = "5.16.1"; src = fetchFromGitHub { owner = "luanti-org"; repo = "luanti"; tag = finalAttrs.version; - hash = "sha256-E7YkUFuDvEuJpmn7ReasKZnQHucl6YbTk8InUtzTi9U="; + hash = "sha256-EzLjLkN/3BdcpWJ92QnrdhxKmY6Bz2JkOC0oX0TrUtI="; }; patches = [ diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index c09e1f7b795c..cd7217cc68cc 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -15,16 +15,16 @@ in buildGo126Module (finalAttrs: { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "bluenviron"; repo = "mediamtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-3ZKN2J3M8JhjbGWnYjweERM2GvlT+GK2OahPcFEpsLA="; + hash = "sha256-qhW2q3PoOXBRtW4YXKMIYbQG4LypVLcSeV/uQ66hOgg="; }; - vendorHash = "sha256-QCUMMYMwg/5a8dPqCegEkm4yChk7BrdOjSoAFZS9Arg="; + vendorHash = "sha256-dWMwD1jG7+69d00T/T+7jY6MgodGuBpSBDwEHSGOKLQ="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index bf610a7e681b..92c658dfed26 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "2c817196d3698a5964356f8cd2da44048228b9dd"; - hash = "sha256-L5S97cp3EE/MLOzpO/Q3/B6zOtn1iRkZjfzEl3RDGNU="; + rev = "a5fcada8aa006fec3698037f4702e66122994e6c"; + hash = "sha256-kY3uXHsXDYRml4mZAZaFK95BDju92cmMZ4XoSNoNquo="; }; - vendorHash = "sha256-BbCCOgx6Tis2e07nSftdIi7cv8cHIXlsZl5Qk4fsWh8="; + vendorHash = "sha256-A5gfYxgbq+5WG4W642fhRHw78oWGOrI+OyJ66W/gl00="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index 630e047a133c..c92c8a00a086 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -78,11 +78,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "postfix"; - version = "3.11.2"; + version = "3.11.3"; src = fetchurl { url = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${finalAttrs.version}.tar.gz"; - hash = "sha256-2u1lsIySiM2zhqkU8+Us3d1Ek1QHtc5a7ovMOqQgd3g="; + hash = "sha256-vRHcxGPXBF5A8sEcwAIWSJxztYzECz0GxUJlsIihc+E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 8fe37b094015..eb7f47336afb 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.5.6"; + version = "26.5.12"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-q+1EjgrhF1Zt+LZM5BXZ+UJqGavMPsRJ3ZfD+LbVQds="; + hash = "sha256-xb7bRcqxO51u3ZDxIlPaK7rUxsl2W5+81u8OLPFSgPs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index b21c00601acb..d484b3704b0e 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -9,12 +9,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "quisk"; - version = "4.2.50"; + version = "4.2.51"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-HFZhVJxDUeFDFboWYGiuJYG8fb+xeWBKKi/6uBiDp84="; + hash = "sha256-BUS9LW64AmOseedjxEA03MT9Sz9dLmOCVE2IXGovXxo="; }; buildInputs = [ diff --git a/pkgs/by-name/ra/raleway/package.nix b/pkgs/by-name/ra/raleway/package.nix index f1b0c6dd3d43..89b372783ba5 100644 --- a/pkgs/by-name/ra/raleway/package.nix +++ b/pkgs/by-name/ra/raleway/package.nix @@ -2,6 +2,7 @@ lib, fetchzip, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -13,14 +14,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww="; }; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf - install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Raleway is an elegant sans-serif typeface family"; diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 2b63dbd3f87c..d4e4249bfe9e 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -51,16 +51,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rio"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; tag = "v${finalAttrs.version}"; - hash = "sha256-br3PiI+b2kpNZuzLg9SBRfKS3uo6FKoPUnKUMOq519s="; + hash = "sha256-fjPuB2/sEXsE8gnnvDLU5a6Qgac3crbs7v/kOlUhtZE="; }; - cargoHash = "sha256-GzdO+ezGh1xgziW9epKbds0oxf2dYEzospKA648ESN0="; + cargoHash = "sha256-4J9JppiaL377m2THRZhxCkDuHJggJBCHhnWaV1E0fIA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/so/sox_ng/package.nix b/pkgs/by-name/so/sox_ng/package.nix new file mode 100644 index 000000000000..a94ec98e06c9 --- /dev/null +++ b/pkgs/by-name/so/sox_ng/package.nix @@ -0,0 +1,114 @@ +{ + config, + lib, + stdenv, + fetchFromCodeberg, + autoreconfHook, + autoconf-archive, + pkg-config, + enableReplace ? true, + enableAMR ? true, + opencore-amr, + enableAlsa ? true, + alsa-lib, + enableFLAC ? true, + flac, + enableFFTW ? true, + fftw, + enableLadspa ? true, + ladspa-sdk, + enableLame ? config.sox.enableLame or false, + lame, + enableLibao ? true, + libao, + enableLibid3tag ? true, + libid3tag, + enableLibmad ? true, + libmad, + enableLibogg ? true, + libogg, + libvorbis, + enableLibpulseaudio ? + stdenv.hostPlatform.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, + libpulseaudio, + enableLibsndfile ? true, + libsndfile, + enableOpusfile ? true, + opusfile, + enablePNG ? true, + libpng, + enableSpeex ? true, + speex, + speexdsp, + enableTwolame ? config.sox.enableTwolame or false, + twolame, + enableWavpack ? true, + wavpack, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sox"; + version = "14.7.1.2"; + + src = fetchFromCodeberg { + owner = "sox_ng"; + repo = "sox_ng"; + tag = "sox_ng-${finalAttrs.version}"; + hash = "sha256-yIebX0a/fbpr/NMgiK+gjDPNValf3gITpxDSJAc6eAw="; + }; + + strictDeps = true; + __structuredAttrs = true; + + outputs = [ + "out" + "dev" + "lib" + "man" + ]; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; + + buildInputs = + lib.optional (enableAlsa && stdenv.hostPlatform.isLinux) alsa-lib + ++ lib.optional enableAMR opencore-amr + ++ lib.optional enableFLAC flac + ++ lib.optional enableFFTW fftw + ++ lib.optional enableLadspa ladspa-sdk + ++ lib.optional enableLame lame + ++ lib.optional enableLibao libao + ++ lib.optional enableLibid3tag libid3tag + ++ lib.optional enableLibmad libmad + ++ lib.optional enableLibpulseaudio libpulseaudio + ++ lib.optional enableLibsndfile libsndfile + ++ lib.optional enableOpusfile opusfile + ++ lib.optional enablePNG libpng + ++ lib.optional enableTwolame twolame + ++ lib.optional enableWavpack wavpack + ++ lib.optionals enableLibogg [ + libogg + libvorbis + ] + ++ lib.optionals enableSpeex [ + speex + speexdsp + ]; + + configureFlags = [ + (lib.enableFeature enableReplace "replace") + ]; + + enableParallelBuilding = true; + + meta = { + description = "Another Swiss Army Knife of sound processing utilities"; + homepage = "https://codeberg.org/sox_ng/sox_ng"; + maintainers = with lib.maintainers; [ fpletz ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index 34886c03d2f4..19cc0591afc1 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "spacectl"; - version = "1.21.2"; + version = "1.21.5"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-wUsbybT4kcm38LTcmDy3Khhtk4VlShpaEBOUL4AlfXE="; + hash = "sha256-BHf5oDBWRGg8uKuctCiztEvgRmOEOVebGmvjk7Da0y4="; }; - vendorHash = "sha256-W42yLY7zMl+ojkqW0+/NIbmgVMUm8JqRTCDWsfV6gys="; + vendorHash = "sha256-NvnsRvLnUJgxhx65nse2er65RRPatZF28rLiRBMnNhY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/steelix/package.nix b/pkgs/by-name/st/steelix/package.nix index 7c34987a1d48..74dd6630e3b3 100644 --- a/pkgs/by-name/st/steelix/package.nix +++ b/pkgs/by-name/st/steelix/package.nix @@ -4,6 +4,7 @@ installShellFiles, lib, rustPlatform, + makeBinaryWrapper, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -19,9 +20,11 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-6bu8sIM4So3AbnHHYbh8uu+rEB4IjMQjDgh7/AkLQs0="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + ]; - # Don't use cargo xtask steel since it needs network access cargoBuildFlags = [ "--package" "helix-term" @@ -30,9 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; env = { - # Disable fetching and building of tree-sitter grammars in the helix-term build.rs HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1"; - # Use tree-sitter grammars and runtime from the helix package HELIX_DEFAULT_RUNTIME = helix.runtime; }; @@ -41,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} cp contrib/Helix.desktop $out/share/applications cp contrib/helix.png $out/share/icons/hicolor/256x256/apps + wrapProgram $out/bin/hx --set HELIX_RUNTIME "${helix.runtime}" ''; passthru.updateScript = ./update.sh; @@ -48,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Helix editor with Steel (Scheme) scripting support"; longDescription = '' - Steelix is a fork of the Helix text editor with Steel (Scheme) scripting support. + Steelix is a fork of the Helix editor with Steel (Scheme) scripting support. ''; homepage = "https://github.com/mattwparas/helix"; changelog = "https://github.com/mattwparas/helix/blob/${finalAttrs.src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/te/tectonic-unwrapped/package.nix b/pkgs/by-name/te/tectonic-unwrapped/package.nix index 68d0cd3f4d1e..b5c1f90efce5 100644 --- a/pkgs/by-name/te/tectonic-unwrapped/package.nix +++ b/pkgs/by-name/te/tectonic-unwrapped/package.nix @@ -108,7 +108,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=tests::no_segfault_after_failed_compilation" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Test Panics only on Darwin, see: + # Another sandbox failing test, see: # https://github.com/tectonic-typesetting/tectonic/issues/1352 "--skip=v2_watch_succeeds" ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index d5e090bee2a9..58aac18bde23 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.11.0"; + version = "4.12.0"; pyproject = true; src = fetchFromGitHub { owner = "getpelican"; repo = "pelican"; tag = version; - hash = "sha256-SrzHAqDX+DCeaWMmlG8tgA1RKLDnICkvDIE/kUQZN+s="; + hash = "sha256-g/wm4ZA4KBMnvpe58ZQ7lTUBF6PywC4IivmBBco4F00="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -53,7 +53,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pelican/tests/test_pelican.py \ - --replace "'git'" "'${git}/bin/git'" + --replace-fail "\"git\"" "'${git}/bin/git'" ''; build-system = [ pdm-backend ]; @@ -88,6 +88,7 @@ buildPythonPackage rec { nativeCheckInputs = [ beautifulsoup4 + git lxml mock pandoc @@ -95,23 +96,11 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlags = [ - # DeprecationWarning: 'jinja2.Markup' is deprecated and... - "-Wignore::DeprecationWarning" - # PendingDeprecationWarning: `Publisher.set_components()` will be removed in ... - "-Wignore::PendingDeprecationWarning" - ]; - disabledTests = [ # AssertionError "test_basic_generation_works" "test_custom_generation_works" "test_custom_locale_generation_works" - "test_deprecated_attribute" - # AttributeError - "test_wp_custpost_true_dirpage_false" - "test_can_toggle_raw_html_code_parsing" - "test_dirpage_directive_for_page_kind" ]; env.LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/prowlpy/default.nix b/pkgs/development/python-modules/prowlpy/default.nix index 55a6e19b6797..c4cd08413856 100644 --- a/pkgs/development/python-modules/prowlpy/default.nix +++ b/pkgs/development/python-modules/prowlpy/default.nix @@ -1,42 +1,42 @@ { buildPythonPackage, - click, + cacert, fetchFromGitHub, - httpx, lib, loguru, + pyreqwest, pytest-asyncio, pytest-cov-stub, pytestCheckHook, respx, setuptools, + typer, xmltodict, }: buildPythonPackage rec { pname = "prowlpy"; - version = "1.1.5"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "OMEGARAZER"; repo = "prowlpy"; tag = "v${version}"; - hash = "sha256-psXq858y5wsDU5GqGOzVFmYBSZvfuYXzOTZ20mx8PMw="; + hash = "sha256-S+hhZndOb5O9okrrnXGt7D0N4VRIThbMN1LYVPGzFy8="; }; build-system = [ setuptools ]; dependencies = [ - httpx + pyreqwest xmltodict - ] - ++ httpx.optional-dependencies.http2; + ]; optional-dependencies = { cli = [ - click loguru + typer ]; }; @@ -50,6 +50,12 @@ buildPythonPackage rec { ] ++ lib.concatAttrValues optional-dependencies; + preCheck = '' + # Without this pyreqwest fails with + # unexpected error: No CA certificates were loaded from the system + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + # tests fail without this pytestFlags = [ "-v" ]; diff --git a/pkgs/development/python-modules/pyreqwest/default.nix b/pkgs/development/python-modules/pyreqwest/default.nix new file mode 100644 index 000000000000..10b189757108 --- /dev/null +++ b/pkgs/development/python-modules/pyreqwest/default.nix @@ -0,0 +1,78 @@ +{ + buildPythonPackage, + cacert, + dirty-equals, + docker, + fetchFromGitHub, + granian, + httpx, + lib, + pydantic, + pytest-asyncio, + pytestCheckHook, + requests-toolbelt, + rustPlatform, + starlette, + syrupy, + trustme, + yarl, +}: + +buildPythonPackage (finalAttrs: { + pname = "pyreqwest"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MarkusSintonen"; + repo = "pyreqwest"; + tag = "v${finalAttrs.version}"; + hash = "sha256-o33/KkPBl4ActDV0R8KqWll6F47HPO3amHFI00rHryE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-+flEikEImbiu/x+pJQz3rynYKmfjaS9N0/A1HSzH0jU="; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + pythonImportsCheck = [ "pyreqwest" ]; + + nativeCheckInputs = [ + dirty-equals + docker + granian + httpx + pydantic + pytest-asyncio + pytestCheckHook + requests-toolbelt + starlette + syrupy + trustme + yarl + ]; + + preCheck = '' + # Without this tests fails with + # unexpected error: No CA certificates were loaded from the system + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + disabledTestPaths = [ + # requires a running Docker daemon + "tests/test_examples.py" + ]; + + meta = { + changelog = "https://github.com/MarkusSintonen/pyreqwest/releases/tag/${finalAttrs.src.tag}"; + description = "Fast Python HTTP client based on Rust reqwest"; + homepage = "https://github.com/MarkusSintonen/pyreqwest"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/development/python-modules/qcs-api-client-common/default.nix b/pkgs/development/python-modules/qcs-api-client-common/default.nix index d241f7d80576..1b5213b2a952 100644 --- a/pkgs/development/python-modules/qcs-api-client-common/default.nix +++ b/pkgs/development/python-modules/qcs-api-client-common/default.nix @@ -9,6 +9,7 @@ pytest-asyncio, pytest-mock, pytestCheckHook, + pythonAtLeast, rustc, rustPlatform, syrupy, @@ -57,6 +58,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # asyncio.Future() in sync fixture has no implicit event loop on 3.14 + "test_refresh_interceptor" + ]; + meta = { changelog = "https://github.com/rigetti/qcs-api-client-rust/blob/${src.tag}/qcs-api-client-common/CHANGELOG-py.md"; description = "Contains core QCS client functionality and middleware implementations"; diff --git a/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix b/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix new file mode 100644 index 000000000000..080708954304 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/ecoflow_ble/package.nix @@ -0,0 +1,54 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + bleak, + bleak-retry-connector, + crc, + ecdsa, + jsonpath-ng, + protobuf6, + pycryptodome, + pytestCheckHook, + pytest-asyncio, + pytest-mock, + nix-update-script, +}: + +buildHomeAssistantComponent rec { + owner = "rabits"; + domain = "ef_ble"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "rabits"; + repo = "ha-ef-ble"; + tag = "v${version}"; + hash = "sha256-hqwsoG8BkB16zR5MX3NNltEQAZR0ZhVFNXSqDsvep+0="; + }; + + dependencies = [ + bleak + bleak-retry-connector + ecdsa + crc + protobuf6 + pycryptodome + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/rabits/ha-ef-ble/releases/tag/v${version}"; + description = "Home Assistant component for EcoFlow BLE devices (local)"; + homepage = "https://github.com/rabits/ha-ef-ble"; + maintainers = with lib.maintainers; [ implr ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index cf0429f3fa7c..db59bb81613c 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -70,8 +70,7 @@ stdenv.mkDerivation { cp ./install/linux-install/nifskope.desktop $out/share/applications substituteInPlace $out/share/applications/nifskope.desktop \ - --replace 'Exec=nifskope' "Exec=$out/bin/NifSkope" \ - --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png" + --replace-fail 'Exec=nifskope' "Exec=NifSkope" \ find $out/share -type f -exec chmod -x {} \; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d55902fe5911..0443a3664d6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14992,6 +14992,8 @@ self: super: with self; { pyrepetierng = callPackage ../development/python-modules/pyrepetierng { }; + pyreqwest = callPackage ../development/python-modules/pyreqwest { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfc3339 = callPackage ../development/python-modules/pyrfc3339 { };