diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-16 18:04:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-16 18:04:48 +0000 |
commit | 8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99 (patch) | |
tree | 208f07583ad7e7dc2ace941887a32bb3c3b2204d /pkgs/applications/audio | |
parent | e3dfa794412778ab993054a8e0a55a7a5490c022 (diff) | |
parent | 2d104c99a7d99ead0a9eeb74f1f523aa77aae743 (diff) | |
download | nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.tar nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.tar.gz nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.tar.bz2 nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.tar.lz nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.tar.xz nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.tar.zst nixpkgs-8b9fa8d446e2f601cfb6599ce1f9ee5224d6bc99.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/helvum/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/ptcollab/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/audio/sidplayfp/default.nix | 11 |
3 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 1ecf9c56e86..cc98e9fb359 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "helvum"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ryuukyu"; repo = pname; rev = version; - sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w="; + sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A="; }; - cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw="; + cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU="; nativeBuildInputs = [ clang copyDesktopItems pkg-config ]; buildInputs = [ glib gtk4 pipewire ]; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index f5752dd96f4..c5b9f2b804e 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , nix-update-script , qmake +, pkg-config , qtbase , qtmultimedia , libvorbis @@ -12,21 +13,16 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85"; + sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w="; }; - postPatch = '' - substituteInPlace src/editor.pro \ - --replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi' - ''; - - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ]; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 4f7e43ca004..b27593626ef 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, nix-update-script , autoreconfHook , perl , pkg-config @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4"; + sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; @@ -37,6 +38,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; |