Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5ad6c8071e
29 changed files with 444 additions and 82 deletions
|
|
@ -321,7 +321,7 @@ in
|
|||
''}
|
||||
'';
|
||||
} // optionalAttrs (backup.dynamicFilesFrom != null || backup.backupCleanupCommand != null) {
|
||||
postStart = ''
|
||||
postStop = ''
|
||||
${optionalString (backup.backupCleanupCommand != null) ''
|
||||
${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand}
|
||||
''}
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
108
pkgs/applications/audio/touchosc/default.nix
Normal file
108
pkgs/applications/audio/touchosc/default.nix
Normal file
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
54
pkgs/development/compilers/gcc-arm-embedded/11/default.nix
Normal file
54
pkgs/development/compilers/gcc-arm-embedded/11/default.nix
Normal file
|
|
@ -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" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
70
pkgs/development/interpreters/bats/libraries.nix
Normal file
70
pkgs/development/interpreters/bats/libraries.nix
Normal file
|
|
@ -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 ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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 {})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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; [
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue