diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 56958bf949d6..2b0dcb16344c 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -321,7 +321,7 @@ in ''} ''; } // optionalAttrs (backup.dynamicFilesFrom != null || backup.backupCleanupCommand != null) { - postStart = '' + postStop = '' ${optionalString (backup.backupCleanupCommand != null) '' ${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand} ''} diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 09b5c3f410c1..1af5357cf0eb 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "1azxdr2m84ci6ppzy0j17wmza7prlnw055fks6s4i77sjw45rhlq"; + sha256 = "1lvdym7wcg9042an03zxvckq6kmcd5v5snp2ma54f4knj9kmzwyf"; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix new file mode 100644 index 000000000000..1a2cc43e4d88 --- /dev/null +++ b/pkgs/applications/audio/touchosc/default.nix @@ -0,0 +1,108 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, dpkg +, alsa-lib +, curl +, avahi +, jack2 +, libxcb +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXxf86vm +, libglvnd +, gnome +}: + +let + runLibDeps = [ + curl + avahi + jack2 + libxcb + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXrender + libXxf86vm + libglvnd + ]; + + runBinDeps = [ + gnome.zenity + ]; +in + +stdenv.mkDerivation rec { + pname = "touchosc"; + version = "1.1.4.143"; + + suffix = { + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; + x86_64-linux = "linux-x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; + hash = { + aarch64-linux = "sha256-BLPTCaFtsvYzesFvOJVCCofgRVpT2hCvrpYbceh95J4="; + armv7l-linux = "sha256-RpHAXj2biZDqeE9xy3Q+fcGTIvCXfTJNn/jMObfL44g="; + x86_64-linux = "sha256-CD8JR1QVMBe//MyrNfo8RE1ogoVU0H87IU5rTg5rDAU="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + unpackCmd = "mkdir root; dpkg-deb -x $curSrc root"; + + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r usr/share $out/share + + mkdir -p $out/bin + cp opt/touchosc/TouchOSC $out/bin/TouchOSC + + wrapProgram $out/bin/TouchOSC \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runLibDeps} \ + --prefix PATH : ${lib.makeBinPath runBinDeps} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://hexler.net/touchosc"; + description = "Next generation modular control surface"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; + mainProgram = "TouchOSC"; + }; +} diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 6286e64e3efe..291d63d11a0d 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -1,15 +1,51 @@ -{ lib, stdenv -, fetchzip +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, dpkg , alsa-lib -, glib -, gst_all_1 -, libGLU, libGL -, xorg +, curl +, avahi +, gstreamer +, gst-plugins-base +, libxcb +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXxf86vm +, libglvnd +, gnome }: +let + runLibDeps = [ + curl + avahi + libxcb + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXrender + libXxf86vm + libglvnd + ]; + + runBinDeps = [ + gnome.zenity + ]; +in + stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.9.8.143"; + version = "1.0.5.161"; suffix = { aarch64-linux = "linux-arm64"; @@ -17,51 +53,55 @@ stdenv.mkDerivation rec { x86_64-linux = "linux-x86_64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - src = fetchzip { - url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.zip"; - sha256 = { - aarch64-linux = "0ryjmpzpfqdqrvqpq851vvrjd8ld5g91gcigpv9rxp3z1b7qdand"; - armv7l-linux = "08nlwn8ixndqil4m7j6c8gjxmwx8zi3in86arnwf13shk6cds5nb"; - x86_64-linux = "0kbz7pvh4i4a3pj1vzbzzslha825i888isvsigcqsqvipjr4798q"; + src = fetchurl { + url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; + hash = { + aarch64-linux = "sha256-6QZ5jCxINCH46GQx+V68FpkIAOIOFw4Kd0tUQTKBRzU="; + armv7l-linux = "sha256-eToNjPttY62EzNuRSVvJsHttO6Ux6LXRPRuuIKnvaxM="; + x86_64-linux = "sha256-5M2tgpF74RmrCLI44RBNXK5t0hMAOHtmcjWu7fypc0U="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - preferLocalBuild = true; + unpackCmd = "mkdir root; dpkg-deb -x $curSrc root"; + + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + gstreamer + gst-plugins-base + ]; installPhase = '' runHook preInstall + + mkdir -p $out + cp -r usr/share $out/share + mkdir -p $out/bin - mv KodeLife $out/bin + cp opt/kodelife/KodeLife $out/bin/KodeLife + + wrapProgram $out/bin/KodeLife \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runLibDeps} \ + --prefix PATH : ${lib.makeBinPath runBinDeps} + runHook postInstall ''; - preFixup = let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib - alsa-lib - glib - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libGLU libGL - xorg.libX11 - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - $out/bin/KodeLife - ''; - meta = with lib; { - homepage = "https://hexler.net/products/kodelife"; + homepage = "https://hexler.net/kodelife"; description = "Real-time GPU shader editor"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ prusnak lilyinstarlight ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; + mainProgram = "KodeLife"; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix new file mode 100644 index 000000000000..1e7e1c307c7c --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, ncurses5 +, python38 +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "11.3.rel1"; + + platform = { + aarch64-darwin = "darwin-x86_64"; # use intel binaries via rosetta + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + sha256 = { + aarch64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; + aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; + x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; + x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 ]} "$f" || true + done + ''; + + meta = with lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index ef1a110f8e74..89539850163e 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -13,6 +13,10 @@ , ps , bats , lsof +, callPackages +, symlinkJoin +, makeWrapper +, runCommand , doInstallCheck ? true }: @@ -105,6 +109,52 @@ resholve.mkDerivation rec { }; }; + passthru.libraries = callPackages ./libraries.nix {}; + + passthru.withLibraries = selector: + symlinkJoin { + name = "bats-with-libraries-${bats.version}"; + + paths = [ + bats + ] ++ selector bats.libraries; + + nativeBuildInputs = [ + makeWrapper + ]; + + postBuild = '' + wrapProgram "$out/bin/bats" \ + --suffix BATS_LIB_PATH : "$out/share/bats" + ''; + }; + + passthru.tests.libraries = runCommand "${bats.name}-with-libraries-test" { + testScript = '' + setup() { + bats_load_library bats-support + bats_load_library bats-assert + + bats_require_minimum_version 1.5.0 + } + + @test echo_hi { + run -0 echo hi + assert_output "hi" + } + + @test cp_failure { + run ! cp + assert_line --index 0 "cp: missing file operand" + assert_line --index 1 "Try 'cp --help' for more information." + } + ''; + passAsFile = [ "testScript" ]; + } '' + ${bats.withLibraries (p: [ p.bats-support p.bats-assert ])}/bin/bats "$testScriptPath" + touch "$out" + ''; + passthru.tests.upstream = bats.unresholved.overrideAttrs (old: { name = "${bats.name}-tests"; dontInstall = true; # just need the build directory diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix new file mode 100644 index 000000000000..74324b03e6ad --- /dev/null +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -0,0 +1,70 @@ +{ lib, stdenv, fetchFromGitHub }: { + bats-assert = stdenv.mkDerivation { + pname = "bats-assert"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "bats-core"; + repo = "bats-assert"; + rev = "v2.0.0"; + sha256 = "sha256-whSbAj8Xmnqclf78dYcjf1oq099ePtn4XX9TUJ9AlyQ="; + }; + dontBuild = true; + installPhase = '' + mkdir -p "$out/share/bats" + cp -r . "$out/share/bats/bats-assert" + ''; + meta = { + description = "Common assertions for Bats"; + platforms = lib.platforms.all; + homepage = "https://github.com/bats-core/bats-assert"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ infinisil ]; + }; + }; + + bats-file = stdenv.mkDerivation { + pname = "bats-file"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "bats-core"; + repo = "bats-file"; + rev = "v0.3.0"; + sha256 = "sha256-3xevy0QpwNZrEe+2IJq58tKyxQzYx8cz6dD2nz7fYUM="; + }; + dontBuild = true; + installPhase = '' + mkdir -p "$out/share/bats" + cp -r . "$out/share/bats/bats-file" + ''; + meta = { + description = "Common filesystem assertions for Bats"; + platforms = lib.platforms.all; + homepage = "https://github.com/bats-core/bats-file"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ infinisil ]; + }; + }; + + bats-support = stdenv.mkDerivation { + pname = "bats-support"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "bats-core"; + repo = "bats-support"; + rev = "v0.3.0"; + sha256 = "sha256-4N7XJS5XOKxMCXNC7ef9halhRpg79kUqDuRnKcrxoeo="; + }; + dontBuild = true; + installPhase = '' + mkdir -p "$out/share/bats" + cp -r . "$out/share/bats/bats-support" + ''; + meta = { + description = "Supporting library for Bats test helpers"; + platforms = lib.platforms.all; + homepage = "https://github.com/bats-core/bats-support"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ infinisil ]; + }; + }; +} diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 337bbb1f994c..f0a07a855f8a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -206,9 +206,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "b5"; + suffix = "rc1"; }; - sha256 = "sha256-OBC9IvfcNKmcKi60uFJkpN9PBe9ZxODMwuqC7pxJFpg="; + sha256 = "sha256-U6U3fDeoosbaB1sU651jN0V59/PHGPog8KH7sOlKkis="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 7f4c53071d0c..22ef87e43d04 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_43 dbus - xvfb-run glib + ] ++ lib.optionals stdenv.isLinux [ + xvfb-run ]; buildInputs = [ @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { "-Denable_gtk_doc=true" ]; - doCheck = true; + doCheck = stdenv.isLinux; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index 1f978a90df45..023b327cc08e 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "1.1"; pname = "ocaml${ocaml.version}-num"; src = fetchFromGitHub { @@ -28,4 +28,7 @@ stdenv.mkDerivation rec { inherit (ocaml.meta) platforms; inherit (src.meta) homepage; }; -} +} // (if lib.versions.majorMinor ocaml.version == "4.06" then { + NIX_CFLAGS_COMPILE = "-fcommon"; + } else {}) +) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index ff637dd4979e..61b67cb32a31 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Dm05DCNPyQW62RRIVf995jEa5A6kqYyhsUNn+XCjSSI="; + hash = "sha256-qG+EPZjH3I4TRGka7J21ukGpuJQfA/Nuy6DbIUnykcs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 8b30095e8a4d..850ab5944429 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "1.2.5"; + version = "1.2.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aZNvKrOKYfrpyteFe4iDLUqlk9n3tMGwatNrV5r8mgg="; + hash = "sha256-69Lg+sw/USNrqtjk8VlsyFydu8Rz9duaoZ1d7KJ2Dfk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index c187ae5a59e0..409b482caa3d 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "1.4.0"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-vp+tZIDFuO41r34z8+aUf3dhYhaUeLZ3l9JNvjsqKc4="; + hash = "sha256-H7qhtUl9dLGX51lXLsjEAyLTcHifN8fwSQFOAGaH/RM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index b73f266d39ce..e03268fb9893 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.4"; + version = "1.14.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cp+mwP6TWyZm8/6tfsV2+RGubo1731ePmy+5K6N3u7M="; + hash = "sha256-ziqW7PYmkvpPor1WIH9+qKs3p0qx1QJSVLgPtTFpqYs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix index 7c0a236e62d8..b80f5058cae8 100644 --- a/pkgs/development/python-modules/pescea/default.nix +++ b/pkgs/development/python-modules/pescea/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pescea"; - version = "1.0.10"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "lazdavila"; repo = pname; rev = "v${version}"; - sha256 = "Q38mLGjrRdXEvT+PCNsil1e2p0mmM0Xy8TUx9QOnFRA="; + sha256 = "sha256-yiBtvD7kCqR/F4yoJa5rIOekYy8+zlJh849Jv+HkA4M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 4ddd955cf4d0..45fd001dd9a3 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.12.0"; + version = "4.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-GtFAHNqneoWPCUegFDIpmeyuCsjwAx9o6t0ptGNLBeQ="; + sha256 = "sha256-OzHykLpcy+ZA3jfzrDwmCoNb4JhvdHYJErzfWn+zjqo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index ef9fb2eff9be..9e2a3a642a63 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.21.1"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-9tnLUzr7FWZlpN6mLLv1Q5EZ4wgquCC5nxGNyT63dzY="; + sha256 = "sha256-vWPKlI1dRj2bN36SnkkjibACPkCqjlQn2Dq9+usgOhc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index dd7193d6c7e0..f5c4d936aebd 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pytarNr+lBb4rJqj7V1vJ8aWgojYJWhDLg9wOhdT3ZY="; + hash = "sha256-hahWY7BIO8c6DmCgG+feZdNikbYWycFCl0E6P1uEQ/M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index fdcfe0495377..f81c1197eb34 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.0.11"; + version = "4.0.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-81nottXXenkIPiDnR8O44ELStoh8i2yROYCPvBLiWSU="; + hash = "sha256-xbODjgJHd1e3NdnoB/srlOdeuhOj2JeN8b8MQh3D4+A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 7f4c2b121656..2c2c59825598 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,13 +1,13 @@ { - "version": "0.1.10", + "version": "0.1.11", "assets": { "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1dqvvdwmakdbbq02h33impv84jzks6ba33jgaf2py4rri6hr84rg" + "sha256": "1s87knvvxbsikxbiza3hybykp437ba5j1amymlis20yf826k5sh7" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0wjqrkmhk1pjf02c44nffbcgsdq5x9sswjwjfvcs33qpvc712f30" + "sha256": "1by463daq5sa0bpd8hc5knj5gj30c4c8mbgmiq6fj3612220gc4c" } } } diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d9b56428f5cc..6b5c2ba42f8d 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}" ] ++ lib.optional (!pythonSupport) "--without-python" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls" + ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent" ++ lib.optional enableDebuginfod "--with-debuginfod=yes"; postInstall = diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix index 23efce44cff8..a4c3179e8e58 100644 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/pkgs/development/tools/misc/nix-bisect/default.nix @@ -25,6 +25,11 @@ python3.pkgs.buildPythonApplication { url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch"; hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A="; }) + (fetchpatch { + # Fixes TypeError crashes associated with drvs_failed inconsistency + url = "https://github.com/timokau/nix-bisect/commit/9f3a17783046baae64c16f9e2be917c2603977fc.patch"; + hash = "sha256-U9NUtgwslcgIf/wvH/WE7t0HGs2OP3wvYDKrb5j+lp0="; + }) ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index a8d4f8b28c91..9203eb622897 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.3.56"; + version = "2.3.58"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-dH52yIzGO5n+TwNNPu51cpNIrqG/9CXERrJvo+m6R4w="; + sha256 = "sha256-WQa9J+rK71+T2IFUVpPLjkYfHy9GmZ9DZTBo+U4JKfo="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 12824caee239..872f06b96a42 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "railway"; - version = "1.8.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7hYbTDY+ECaOKuK54hPA9oeOSnBWYUvxWJ7GElZKoWE="; + sha256 = "sha256-0849Rm1QSMAJ2jVK0H8sA89bxI2nFDDTEsnSdXTuWTs="; }; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index ce6dc1a1b27c..541bef93a8a3 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -29,7 +29,7 @@ , gnutls , protobufc , python3 -, wrapGAppsHook +, wrapGAppsNoGuiHook , json-glib , bash-completion , shared-mime-info @@ -159,7 +159,7 @@ let gnutls protobufc # for protoc python - wrapGAppsHook + wrapGAppsNoGuiHook vala ]; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index b944154631ed..d47ea4c544a0 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.8.1507"; + version = "3.0.9.1549"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "sha256-O2UvU1juO54gb9LVnEuIXhT0Ux2rEIq2WdmsoWVDh1w="; + sha256 = "sha256-Ba1nrvnlmVkPI+OEpwShNxfNLrpxS+N7wsx3ajkcGoQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 9a81c7518e5e..968544f2790e 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -23,6 +23,10 @@ , version , pluginOverrides ? { } , disableAllPlugins ? false + + # tests +, runCommand +, beets }@inputs: let inherit (lib) attrNames attrValues concatMap; @@ -63,6 +67,11 @@ python3Packages.buildPythonApplication rec { unidecode ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); + # see: https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 + nativeBuildInputs = [ + gobject-introspection + ]; + buildInputs = [ ] ++ (with gst_all_1; [ gst-plugins-base @@ -137,8 +146,26 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + passthru.plugins = allPlugins; + passthru.tests.gstreamer = runCommand "beets-gstreamer-test" { + meta.timeout = 60; + } + '' + set -euo pipefail + export HOME=$(mktemp -d) + mkdir $out + + cat << EOF > $out/config.yaml +replaygain: + backend: gstreamer +EOF + + echo $out/config.yaml + ${beets}/bin/beet -c $out/config.yaml > /dev/null + ''; + meta = with lib; { description = "Music tagger and library organizer"; homepage = "https://beets.io"; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 069f4e13aff8..eef90d17d67c 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.07.18"; + version = "2022.8.8"; src = fetchPypi { - inherit pname; - version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-DnuB/GrI0bfT//p5+QRMpBY3hEIlgsmjWTMF2ipp7AI="; + inherit pname version; + sha256 = "sha256-Fcq2Em4SrxETQhOAbmpc+X0cYiHhSKomGN3UKTmjCo0="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; @@ -57,7 +56,6 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; - changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md"; longDescription = '' yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 388cb9869fd2..bb72a2f6a0d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13460,6 +13460,7 @@ with pkgs; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; + gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 {}; gcc-arm-embedded = gcc-arm-embedded-10; # Has to match the default gcc so that there are no linking errors when @@ -35664,6 +35665,8 @@ with pkgs; thinkfan = callPackage ../tools/system/thinkfan { }; + touchosc = callPackage ../applications/audio/touchosc {}; + tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { }; tup = callPackage ../development/tools/build-managers/tup { }; @@ -36213,7 +36216,9 @@ with pkgs; uhubctl = callPackage ../tools/misc/uhubctl {}; - kodelife = callPackage ../applications/graphics/kodelife {}; + kodelife = callPackage ../applications/graphics/kodelife { + inherit (gst_all_1) gstreamer gst-plugins-base; + }; bunnyfetch = callPackage ../tools/misc/bunnyfetch {};