diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/audio')
41 files changed, 370 insertions, 296 deletions
diff --git a/nixpkgs/pkgs/applications/audio/aacgain/default.nix b/nixpkgs/pkgs/applications/audio/aacgain/default.nix index 4d45de86f3a1..2bee14797815 100644 --- a/nixpkgs/pkgs/applications/audio/aacgain/default.nix +++ b/nixpkgs/pkgs/applications/audio/aacgain/default.nix @@ -5,27 +5,20 @@ , autoconf , automake , libtool -, faad2 -, mp4v2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "aacgain"; - version = "2.0.0"; + version = "2.0.0-unstable-2022-07-12"; src = fetchFromGitHub { owner = "dgilman"; - repo = pname; - rev = version; - sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU="; + repo = "aacgain"; + rev = "9f9ae95a20197d1072994dbd89672bba2904bdb5"; + hash = "sha256-WqL9rKY4lQD7wQSZizoM3sHNzLIG0E9xZtjw8y7fgmE="; + fetchSubmodules = true; }; - postPatch = '' - cp -R ${faad2.src}/* 3rdparty/faad2 - cp -R ${mp4v2.src}/* 3rdparty/mp4v2 - chmod -R +w 3rdparty - ''; - nativeBuildInputs = [ cmake autoconf diff --git a/nixpkgs/pkgs/applications/audio/abcde/default.nix b/nixpkgs/pkgs/applications/audio/abcde/default.nix index e688e0edccdf..eaf724b68757 100644 --- a/nixpkgs/pkgs/applications/audio/abcde/default.nix +++ b/nixpkgs/pkgs/applications/audio/abcde/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3 +{ lib, stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyed3 , lame, flac, glyr , perlPackages , makeWrapper }: @@ -40,7 +40,7 @@ in --prefix PERL5LIB : "$PERL5LIB" \ --prefix PATH ":" ${lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget - vorbis-tools id3v2 eyeD3 lame flac glyr + vorbis-tools id3v2 eyed3 lame flac glyr ]} done ''; diff --git a/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix b/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix index 5e87c50a3147..a5a8965eee40 100644 --- a/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "26.0"; + version = "26.2"; src = fetchFromSourcehut { owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CmNe70ii3WfQ6GGHVqTEyQ2HVubzoeoeN3JsCZSbsPM="; + sha256 = "sha256-GpfglGC7zD275lm9OsBmqDC90E/vVUqslm7HjPgm74M="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/ardour/default.nix b/nixpkgs/pkgs/applications/audio/ardour/default.nix index 6b001ce85ae6..d6267aff3fef 100644 --- a/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.1"; + version = "8.2"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-T1o1E5+974dNUwEFW/Pw0RzbGifva2FdJPrCusWMk0E="; + hash = "sha256-Ito1gy7k7nzTN7Co/ddXYbAvobiZO0V0J5uymsm756k="; }; bundledContent = fetchzip { @@ -169,7 +169,12 @@ stdenv.mkDerivation rec { "--ptformat" "--run-tests" "--test" - "--use-external-libs" + # since we don't have https://github.com/agfline/LibAAF yet, + # we need to use some of ardours internal libs, see: + # https://discourse.ardour.org/t/ardour-8-2-released/109615/6 + # and + # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 + # "--use-external-libs" ] ++ lib.optional optimize "--optimize"; postInstall = '' diff --git a/nixpkgs/pkgs/applications/audio/cmus/default.nix b/nixpkgs/pkgs/applications/audio/cmus/default.nix index 88d0931ca104..2ebeb5558489 100644 --- a/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -104,7 +104,17 @@ stdenv.mkDerivation rec { patches = [ ./option-debugging.patch # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/ - (fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; }) + (fetchpatch { + name = "ffmpeg-6-compat.patch"; + url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; + hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; + }) + # function detection breaks with clang 16 + (fetchpatch { + name = "clang-16-function-detection.patch"; + url = "https://github.com/cmus/cmus/commit/4123b54bad3d8874205aad7f1885191c8e93343c.patch"; + hash = "sha256-YKqroibgMZFxWQnbmLIHSHR5sMJduyEv6swnKZQ33Fg="; + }) ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/eartag/default.nix b/nixpkgs/pkgs/applications/audio/eartag/default.nix index 02c1b7e8bf22..a40ea62403be 100644 --- a/nixpkgs/pkgs/applications/audio/eartag/default.nix +++ b/nixpkgs/pkgs/applications/audio/eartag/default.nix @@ -57,7 +57,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 - eyeD3 + eyed3 pillow mutagen pytaglib diff --git a/nixpkgs/pkgs/applications/audio/elektroid/default.nix b/nixpkgs/pkgs/applications/audio/elektroid/default.nix deleted file mode 100644 index c76ba7f1c6e5..000000000000 --- a/nixpkgs/pkgs/applications/audio/elektroid/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ alsa-lib -, autoreconfHook -, fetchFromGitHub -, gtk3 -, json-glib -, lib -, libpulseaudio -, libsamplerate -, libsndfile -, libzip -, pkg-config -, stdenv -, zlib -}: - -let - version = "2.5.2"; -in -stdenv.mkDerivation { - inherit version; - - pname = "elektroid"; - - src = fetchFromGitHub { - owner = "dagargo"; - repo = "elektroid"; - rev = version; - sha256 = "sha256-wpPHcrlCX7RD/TGH2Xrth+oCg98gMm035tfTBV70P+Y="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - alsa-lib - gtk3 - json-glib - libpulseaudio - libsamplerate - libsndfile - libzip - zlib - ]; - - meta = with lib; { - description = "Sample and MIDI device manager"; - homepage = "https://github.com/dagargo/elektroid"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ camelpunch ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 4ecf879460cd..b087639ff878 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -23,13 +23,13 @@ with lib.strings; let - version = "2.59.6"; + version = "2.69.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-m6dimBxI9C3KDhUxbJAn2Pf9z+LRahjrzD34W/bf1XA="; + sha256 = "sha256-V2oDP17omIU9Waz5zrOyEHnWrVIfdDRM4KxHb01eyd8="; fetchSubmodules = true; }; @@ -63,16 +63,6 @@ let ncurses_static ]; - patches = [ - # make preset management thread safe - # needed for magnetophonDSP.VoiceOfFaust - # see: https://github.com/grame-cncm/faust/issues/899 - (fetchpatch { - url = "https://github.com/grame-cncm/faust/commit/a1c3a515abbcafea0a6e4e2ec7ecb0f092de5349.patch"; - hash = "sha256-1Ndm+CgxvGEbS6TKGggeu9hW7N3pC+d1kluT2vhGzL8="; - }) - ]; - passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix index a9a9ab519db8..d5e15a190235 100644 --- a/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.68.1"; + version = "2.69.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-jD6/ZeS0xdtajCg5e95E0Jo2lfXOn4OIVf4LJgAfPbo="; + sha256 = "sha256-E7cHDeQV7NVKyoCgI8P3gennpBidk7JmdnFGSIulvvQ="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 50993b056a84..895b39bb9cc2 100644 --- a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.73"; + version = "1.74"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-f5deXMSyZIDKPO7hsNONes/kTFLFodx4nuEjZzkR5Aw="; + hash = "sha256-plr5vmtYL0adeocY4/3hRI2RQ7lDkLvBbQPq2Jw6MvU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/g4music/default.nix b/nixpkgs/pkgs/applications/audio/g4music/default.nix index 9063a8351a18..a0a9f5f828a5 100644 --- a/nixpkgs/pkgs/applications/audio/g4music/default.nix +++ b/nixpkgs/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.3"; + version = "3.4-1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-sajA8+G1frQA0p+8RK84hvh2P36JaarmSZx/sxMoFqo="; + hash = "sha256-uklgxhyrnFQSUcttXvYQtm2BybRkdTK1IfaRpOp0sOE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/giada/default.nix b/nixpkgs/pkgs/applications/audio/giada/default.nix index 72b1fe61296b..15fcf0540583 100644 --- a/nixpkgs/pkgs/applications/audio/giada/default.nix +++ b/nixpkgs/pkgs/applications/audio/giada/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = version; - sha256 = "sha256-q3Lu3UaEKfS7F59G6rPx+5cKcsaXk+xcdtJRIXPwVIs="; + sha256 = "sha256-tONxVxzOFbwnuaW6YoHVZOmgd5S11qz38hcI+yQgjrQ="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/goodvibes/default.nix b/nixpkgs/pkgs/applications/audio/goodvibes/default.nix index b4800889de10..111cad65a013 100644 --- a/nixpkgs/pkgs/applications/audio/goodvibes/default.nix +++ b/nixpkgs/pkgs/applications/audio/goodvibes/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , glib +, glib-networking , gtk3 , libsoup , keybinder3 @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib + # for libsoup TLS support + glib-networking gtk3 libsoup keybinder3 diff --git a/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 7eaac915a5ac..80f12aa2d0dc 100644 --- a/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec { mygpoclient requests pygobject3 - eyeD3 + eyed3 podcastparser html5lib mutagen diff --git a/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix b/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix index a416cbecc02e..0b92b23d1800 100644 --- a/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix +++ b/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-ec4ueg6TNo3AaZ81j01OQZzhgOfSzG1/Vd0QhEXOUl0="; + sha256 = "sha256-U5F78RlM6+R+Ms00Z3aTh3npkbgL+FhhFtc9OpGvbdY="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/jack-passthrough/default.nix b/nixpkgs/pkgs/applications/audio/jack-passthrough/default.nix new file mode 100644 index 000000000000..93f41f1b5952 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/jack-passthrough/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libjack2 +, meson +, ninja +, fmt_9 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jack-passthrough"; + version = "2021-9-25"; + + # https://github.com/guysherman/jack-passthrough + src = fetchFromGitHub { + owner = "guysherman"; + repo = finalAttrs.pname; + rev = "aad03b7c5ccc4a4dcb8fa38c49aa64cb9d628660"; + hash = "sha256-9IsNaLW5dYAqiwe+vX0+D3oIKFP2TIfy1q1YaqmS6wE="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ fmt_9 libjack2 ]; + + meta = with lib; { + description = "A simple app to help with JACK apps that behave strangely."; + longDescription = '' + Creates a JACK passthrough client with an arbitrary name and number of + ports. Common uses include tricking stubborn applications into creating + more ports than they normally would or to prevent them from + auto-connecting to certain things. + ''; + # license unknown: https://github.com/guysherman/jack-passthrough/issues/2 + license = licenses.unfree; + maintainers = [ maintainers.PowerUser64 ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/nixpkgs/pkgs/applications/audio/ledfx/default.nix b/nixpkgs/pkgs/applications/audio/ledfx/default.nix index 9efc5270fb22..a1a4cf3b33c6 100644 --- a/nixpkgs/pkgs/applications/audio/ledfx/default.nix +++ b/nixpkgs/pkgs/applications/audio/ledfx/default.nix @@ -5,18 +5,18 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.80"; + version = "2.0.86"; pyproject= true; src = fetchPypi { inherit pname version; - hash = "sha256-vwLk3EpXqUSAwzY2oX0ZpXrmH2cT0GdYdL/Mifav6mU="; + hash = "sha256-miOGMsrvK3A3SYnd+i/lqB+9GOHtO4F3RW8NkxDgFqU="; }; postPatch = '' substituteInPlace setup.py \ --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \ - --replace "sentry-sdk==1.14.0" "sentry-sdk" \ + --replace "sentry-sdk==1.38.0" "sentry-sdk" \ --replace "~=" ">=" ''; @@ -32,12 +32,14 @@ python3.pkgs.buildPythonPackage rec { cython flux-led icmplib + mss multidict numpy openrgb-python paho-mqtt pillow psutil + pybase64 pyserial pystray python-mbedtls diff --git a/nixpkgs/pkgs/applications/audio/lpd8editor/default.nix b/nixpkgs/pkgs/applications/audio/lpd8editor/default.nix new file mode 100644 index 000000000000..4b92417dc694 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/lpd8editor/default.nix @@ -0,0 +1,41 @@ +{ lib +, qt5 +, stdenv +, git +, fetchFromGitHub +, cmake +, alsa-lib +, qttools +}: + +stdenv.mkDerivation rec { + pname = "lpd8editor"; + version = "0.0.16"; + + src = fetchFromGitHub { + owner = "charlesfleche"; + repo = "lpd8editor"; + rev = "v${version}"; + hash = "sha256-lRp2RhNiIf1VrryfKqYFSbKG3pktw3M7B49fXVoj+C8="; + }; + + buildInputs = [ + qttools + alsa-lib + ]; + + nativeBuildInputs = [ + cmake + git + qt5.wrapQtAppsHook + ]; + + meta = with lib; { + description = "A linux editor for the Akai LPD8"; + homepage = "https://github.com/charlesfleche/lpd8editor"; + license = licenses.mit; + maintainers = with maintainers; [ pinpox ]; + mainProgram = "lpd8editor"; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index e6db737c4016..c3df2ecd30d4 100644 --- a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,20 +5,12 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo="; + sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po="; }; - patches = [ - (fetchpatch { - url = "https://github.com/lsp-plugins/lsp-dsp-lib/commit/58c3f985f009c84347fa91236f164a9e47aafa93.patch"; - stripLen = 1; - extraPrefix = "modules/lsp-dsp-lib/"; - hash = "sha256-pCLucLijXOgp69xNjSRCRxgVoQziT0YiHLnQGbkefqE="; - }) - ]; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix b/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix index f477e3ffa1f2..00f71063bac3 100644 --- a/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix +++ b/nixpkgs/pkgs/applications/audio/miniaudicle/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miniaudicle"; - version = "1.5.0.7"; + version = "1.5.2.0"; src = fetchFromGitHub { owner = "ccrma"; repo = "miniAudicle"; rev = "chuck-${finalAttrs.version}"; - hash = "sha256-CqsajNLcOp7CS5RsVabWM6APnNh4alSKb2/eoZ7F4Ao="; + hash = "sha256-jpPF2Qx/6tiotsj92m1XmxsEUgtm5029ijpu3O8B9qM="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index f634539a9f61..ffa2e3697c6d 100644 --- a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.28"; + version = "10.38"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - sha256 = "sha256-9EFZvD3CicT68hBcc/fS73zonQKDwbV/iNY0CbBmhtE="; + sha256 = "sha256-cVWwbzKyoBYiSPjMVzCGhPr2gPPWp+ateBqzPZojRP0="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix index 417dd8e41a65..3e75eef6dc2f 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2023-11-01"; + version = "unstable-2023-12-20"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "48faaaa2642647b0152231798b46ccd9631694f5"; - hash = "sha256-RwkUdcbDU7/ndVnPteG/iXB2dloljvCHQlvPk4tacuA="; + rev = "2d26b54900bc1fdb974f571036f7101f6e6a3846"; + hash = "sha256-T5lWgjDhYCUe/mWAM1SFHzWbxyJ7US1fn0sPTVi/s2s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix index fb80c10f046f..642d1057b483 100644 --- a/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, extra-cmake-modules , pkg-config , qttools , wrapQtAppsHook @@ -27,18 +28,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "muse-sequencer"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; rev = finalAttrs.version; - hash = "sha256-JPvoximDL4oKO8reXW7alMegwUyUTSAcdq3ueXeUMMY="; + hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0="; }; sourceRoot = "${finalAttrs.src.name}/src"; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + qttools + wrapQtAppsHook + ]; buildInputs = [ alsa-lib diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index d42117e1babe..3dbb9c7884f1 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -48,35 +48,14 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo="; + sha256 = "sha256-vNA1VPCHLt5kuhIix8kgeq1VlbuIX1lOY3nJaufvuyc="; }; - patches = [ - # Upstream from some reason wants to install qml files from qtbase in - # installPhase, this patch removes this behavior. See: - # https://github.com/musescore/MuseScore/issues/18665 - (fetchpatch { - url = "https://github.com/doronbehar/MuseScore/commit/f48448a3ede46f5a7ef470940072fbfb6742487c.patch"; - hash = "sha256-UEc7auscnW0KMfWkLKQtm+UstuTNsuFeoNJYIidIlwM="; - }) - # Upstream removed the option to use system freetype library in v4.1.0, - # causing the app to crash on systems when the outdated bundled freetype - # tries to load the Noto Sans font. For more info on the crash itself, - # see #244409 and https://github.com/musescore/MuseScore/issues/18795. - # For now, re-add the option ourselves. The fix has been merged upstream, - # so we can remove this patch with the next version. In the future, we - # may replace the other bundled thirdparty libs with system libs, see - # https://github.com/musescore/MuseScore/issues/11572. - (fetchpatch { - url = "https://github.com/musescore/MuseScore/commit/9ab6b32b1c3b990cfa7bb172ee8112521dc2269c.patch"; - hash = "sha256-5GA29Z+o3I/uDTTDbkauZ8/xSdCE6yY93phMSY0ea7s="; - }) - ]; cmakeFlags = [ "-DMUSESCORE_BUILD_MODE=release" diff --git a/nixpkgs/pkgs/applications/audio/mympd/default.nix b/nixpkgs/pkgs/applications/audio/mympd/default.nix index 3e130b0855d4..3b2765367d66 100644 --- a/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "13.0.0"; + version = "13.0.6"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U="; + sha256 = "sha256-7yqpm2qMDHWVM5m5FueYlkEFY+VIW8Cx+aRa1iY2vZ4="; }; nativeBuildInputs = [ @@ -63,5 +63,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.doronbehar ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; + mainProgram = "mympd"; }; }) diff --git a/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix index fe642d8167f9..b503f5308b82 100644 --- a/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix @@ -1,17 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, ncurses, libpulseaudio, pandoc, pkg-config }: stdenv.mkDerivation rec { pname = "ncpamixer"; - version = "1.3.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; rev = version; - sha256 = "sha256-iwwfuMZn8HwnTIEBgTuvnJNlRlPt4G+j/piXO8S7mPc="; + sha256 = "sha256-GJ2zSIxSnL53nFZ2aeGlVI7i4APt+aALVEhNP5RkpMc="; }; - nativeBuildInputs = [ cmake pkg-config ]; + patches = [ + ./remove_dynamic_download.patch + ]; + + postPatch = let + PandocMan = fetchurl { + url = "https://github.com/rnpgp/cmake-modules/raw/387084811ee01a69911fe86bcc644b7ed8ad6304/PandocMan.cmake"; + hash = "sha256-KI55Yc2IuQtmbptqkk6Hzr75gIE/uQdUbQsm/fDpaWg="; + }; + in '' + substituteInPlace src/CMakeLists.txt \ + --replace "include(PandocMan)" "include(${PandocMan})" + ''; + + nativeBuildInputs = [ cmake pandoc pkg-config ]; buildInputs = [ ncurses libpulseaudio ]; diff --git a/nixpkgs/pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch b/nixpkgs/pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch new file mode 100644 index 000000000000..af98369983a8 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8aac546..ec809e8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,11 +14,9 @@ if(USE_WIDE) + set(CURSES_NEED_WIDE TRUE) + endif() + +-include(FetchContent) + include(GNUInstallDirs) + + if (BUILD_MANPAGES) +- include("${CMAKE_CURRENT_SOURCE_DIR}/cmake.deps/FetchPandocMan.cmake") + include(PandocMan) + add_pandoc_man("${CMAKE_CURRENT_SOURCE_DIR}/man/ncpamixer.1.md") + endif() diff --git a/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix index f98f45a1b5cb..553e50f16654 100644 --- a/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.13.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg="; + hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao="; }; - cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw="; + cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; diff --git a/nixpkgs/pkgs/applications/audio/noson/default.nix b/nixpkgs/pkgs/applications/audio/noson/default.nix index fb37c93e10fe..b8d29af7abdf 100644 --- a/nixpkgs/pkgs/applications/audio/noson/default.nix +++ b/nixpkgs/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.0"; + version = "5.6.3"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-ZOAnH7pdhlTbqHOM0kiCWcHYJvnskigWdz3N9WjtM0M="; + hash = "sha256-Yv5p9yAEhJHm9ZDZlR76z10oGBNpdifR7ITXcAHIb54="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix deleted file mode 100644 index daafc48deb7a..000000000000 --- a/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, dpkg -, qt5 -, libjack2 -, alsa-lib -, bzip2 -, libpulseaudio }: - -stdenv.mkDerivation rec { - pname = "ocenaudio"; - version = "3.13.2"; - - src = fetchurl { - url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-ITlnOrreZHTH8NDjx/hQzEV3toAwaM2bWFLqMf3btNE="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - qt5.qtbase - qt5.wrapQtAppsHook - libjack2 - libpulseaudio - bzip2 - alsa-lib - ]; - - buildInputs = [ dpkg ]; - - dontUnpack = true; - dontBuild = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out - dpkg -x $src $out - cp -av $out/opt/ocenaudio/* $out - rm -rf $out/opt - - # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/libbz2.so.1.0 - ''; - - meta = with lib; { - description = "Cross-platform, easy to use, fast and functional audio editor"; - homepage = "https://www.ocenaudio.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix index e0d284bc951e..08b1a106a3d5 100644 --- a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix +++ b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix @@ -1,4 +1,14 @@ -{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3, nix-update-script }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, makeBinaryWrapper +, makeDesktopItem +, copyDesktopItems +, nodejs_18 +, electron +, python3 +, nix-update-script +}: buildNpmPackage rec { pname = "open-stage-control"; @@ -18,10 +28,11 @@ buildNpmPackage rec { npmDepsHash = "sha256-UqjYNXdNoQmirIgU9DRgkp14SIrawfrfi9mD2h6ACyU="; + nodejs = nodejs_18; + nativeBuildInputs = [ copyDesktopItems makeBinaryWrapper - python3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix b/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix index 15d6aeee10dd..d0f12a59125d 100644 --- a/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix +++ b/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "osdlyrics"; - version = "0.5.14"; + version = "0.5.15"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = version; - sha256 = "sha256-NVUQLmddXnpryt1AuHSwgPnWkgxWMBNJac09TJ12Yzo="; + hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI="; }; nativeBuildInputs = [ @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { (python3.withPackages (pp: with pp; [ chardet dbus-python - future pycurl pygobject3 ])) @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { description = "Standalone lyrics fetcher/displayer"; homepage = "https://github.com/osdlyrics/osdlyrics"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pedrohlc ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix index 6aa92a3a99fa..23fb4380a2e5 100644 --- a/nixpkgs/pkgs/applications/audio/parlatype/default.nix +++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -2,14 +2,11 @@ , stdenv , fetchFromGitHub , appstream-glib -, dbus , desktop-file-utils , gettext , glib -, gobject-introspection -, gsettings-desktop-schemas , gst_all_1 -, gtk3 +, gtk4 , hicolor-icon-theme , isocodes , itstool @@ -23,20 +20,19 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "3.1"; + version = "4.0"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; + sha256 = "1iyjxss6sgc9gx6ij30zz97bl31qix8pxklzn4kknh1b0j7hhbwq"; }; nativeBuildInputs = [ appstream-glib desktop-file-utils gettext - gobject-introspection itstool libxml2 meson @@ -47,16 +43,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus glib - gsettings-desktop-schemas gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gstreamer - gtk3 + gtk4 hicolor-icon-theme isocodes ]; diff --git a/nixpkgs/pkgs/applications/audio/pithos/default.nix b/nixpkgs/pkgs/applications/audio/pithos/default.nix index ed861f12468b..6de3da92db8a 100644 --- a/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "pithos"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-cFmsdQXfGxgpKe32dw1lgoANU9Drhu5Mecyz37BVP4g="; + hash = "sha256-GPDbFlwiGT/B2paX33d3mUCV77q+fPM0LMaKFsQQjjQ="; }; format = "other"; diff --git a/nixpkgs/pkgs/applications/audio/praat/default.nix b/nixpkgs/pkgs/applications/audio/praat/default.nix index 898fe17db75d..bb43ae075dcc 100644 --- a/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4"; + version = "6.4.01"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-S05A8e3CFzQA7NtZlt85OfkS3cF05QSMWLcuR4UMCV8="; + hash = "sha256-6g9oDPcJpI/udX+GKyCUkv+mjGoTbHU2YfTYaTVRwu4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 6490a15755fa..80b46356fb45 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.06"; + version = "7.07"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-4ANi5KhNbJvDCO2iPX/oayGf/ZeIMfkhp0FQRrBYowo=" else { - x86_64-linux = "sha256-tq0K2HSDTZg7iw6ypS5oUuQi3HIYzbl9DWo2SOKGDVY="; - aarch64-linux = "sha256-MGpfdSQsMykp6QNq1JqxIsFqdhNyefPnEIyC4t1S6Vs="; + hash = if stdenv.isDarwin then "sha256-w1tP7PveKEMMo0jOCDla+NmAdIgrin8UPtprEZ/KgOc=" else { + x86_64-linux = "sha256-u7sc8ZGuieUa8yKKAhVaFHEcFyWrmtTBcHXIkJRE/Ac="; + aarch64-linux = "sha256-MTVNRSo3SOuFOJXDlQ5nBDJWRM3sQg1iVm1VEXOnZfg="; }.${stdenv.hostPlatform.system}; }; diff --git a/nixpkgs/pkgs/applications/audio/renoise/default.nix b/nixpkgs/pkgs/applications/audio/renoise/default.nix index a67832d2d642..d3462ecc6ad5 100644 --- a/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib -, mpg123, releasePath ? null }: +{ lib +, stdenv +, alsa-lib +, fetchurl +, libjack2 +, libX11 +, libXcursor +, libXext +, libXinerama +, libXrandr +, libXtst +, mpg123 +, pipewire +, releasePath ? null +}: # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the release version to some stable location. @@ -7,28 +20,44 @@ # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. let - urlVersion = lib.replaceStrings [ "." ] [ "_" ]; -in + platforms = { + x86_64-linux = { + archSuffix = "x86_64"; + hash = "sha256-Etz6NaeLMysSkcQGC3g+IqUy9QrONCrbkyej63uLflo="; + }; + aarch64-linux = { + archSuffix = "arm64"; + hash = "sha256-PVpgxhJU8RY6QepydqImQnisWBjbrsuW4j49Xot3C6Y="; + }; + }; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.3.2"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - if releasePath == null then - fetchurl { - urls = [ - "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" - "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" - ]; - sha256 = "0d9pnrvs93d4bwbfqxwyr3lg3k6gnzmp81m95gglzwdzczxkw38k"; - } - else - releasePath - else throw "Platform is not supported. Use installation native to your platform https://www.renoise.com/"; - - buildInputs = [ alsa-lib libjack2 libX11 libXcursor libXext libXrandr ]; + version = "3.4.3"; + + src = if releasePath != null then + releasePath + else + let + platform = platforms.${stdenv.system}; + urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; + in fetchurl { + url = + "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"; + hash = platform.hash; + }; + + buildInputs = [ + alsa-lib + libjack2 + libX11 + libXcursor + libXext + libXinerama + libXrandr + libXtst + pipewire + ]; installPhase = '' cp -r Resources $out @@ -79,7 +108,8 @@ stdenv.mkDerivation rec { homepage = "https://www.renoise.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = []; - platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ uakci ]; + platforms = lib.attrNames platforms; + mainProgram = "renoise"; }; } diff --git a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index 3e485e9de4c3..31fa49702203 100644 --- a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -2,38 +2,49 @@ , lib , fetchFromGitHub , nix-update-script -, autoreconfHook -, perl -, pkg-config -, libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib +, autoreconfHook , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio +, libsidplayfp , out123Support ? stdenv.hostPlatform.isDarwin , mpg123 +, perl +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; - rev = "v${version}"; - sha256 = "sha256-ECHtHJrkJ5Y0YvDNdMM3VB+s7I/8JCPZiwsPYLM/oig="; + rev = "v${finalAttrs.version}"; + hash = "sha256-oV7ZPWgMEsNlsF2OoOvf7Ah5ZLcVkIDyC+PrPIJGyzQ="; }; - nativeBuildInputs = [ autoreconfHook perl pkg-config ]; + strictDeps = true; - buildInputs = [ libsidplayfp ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional out123Support mpg123; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + libsidplayfp + ] ++ lib.optionals alsaSupport [ + alsa-lib + ] ++ lib.optionals pulseSupport [ + libpulseaudio + ] ++ lib.optionals out123Support [ + mpg123 + ]; - configureFlags = lib.optionals out123Support [ - "--with-out123" + configureFlags = [ + (lib.strings.withFeature out123Support "out123") ]; enableParallelBuilding = true; @@ -46,7 +57,8 @@ stdenv.mkDerivation rec { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; license = with licenses; [ gpl2Plus ]; + mainProgram = "sidplayfp"; maintainers = with maintainers; [ dezgeg OPNA2608 ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/nixpkgs/pkgs/applications/audio/touchosc/default.nix index f95c3616da8c..1e6ceb52ace8 100644 --- a/nixpkgs/pkgs/applications/audio/touchosc/default.nix +++ b/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.5.183"; + version = "1.2.7.190"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-V5615E2jVqk7CcCBbW5A0JEyEi6secC0Rj8KrQpfjns="; - armv7l-linux = "sha256-0nyRffx8/OieVJTvJRtUIvrx5IyqmqEMMEZszPPDXb0="; - x86_64-linux = "sha256-oV2T7l5/3JqXXoyiR3PeYJyHQe4GcDUxsi6cNxLUcng="; + aarch64-linux = "sha256-VUsT14miAkCjaGWwcsREBgd5uhKLOIHaH9/jfQECVZ4="; + armv7l-linux = "sha256-x5zpeuIEfimiGmM9YWBSaXknIZdpO9RzQjE/bYMt16g="; + x86_64-linux = "sha256-LdMDFNHIWBcaAf+q2JPOm8MqtkaQ+6Drrqkyrrpx6MM="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix index abe49c44f6fa..9509f71a78bf 100644 --- a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix +++ b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.1"; + version = "2.3.1.3"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-NMgy/ucuSRFX2zlO8GhL4QSP4NZo1QKZJYTc2eXzWUA="; + hash = "sha256-G4XLRYFndXW6toRyL7n1xV1ueGKVnkY1NgtpzaZ8h+I="; }; sourceRoot = "${src.name}/src"; diff --git a/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/nixpkgs/pkgs/applications/audio/youtube-music/default.nix index 18e6ba9e5c12..fc135c199bd1 100644 --- a/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -2,45 +2,89 @@ , fetchFromGitHub , buildNpmPackage , makeWrapper -, electron_25 +, electron , python3 , stdenv +, stdenvNoCC , copyDesktopItems +, moreutils +, cacert +, jq +, nodePackages , makeDesktopItem }: let pname = "youtube-music"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "th-ch"; repo = pname; rev = "v${version}"; - hash = "sha256-aYEEUv+dybzcH0aNJlZ19XF++8cswFunrU0H+ZaKm4Y="; + hash = "sha256-6ZiftpdCwxCkJzcHryVrUKzM+mM1eQpdLNFl0Dja59Q="; }; - electron = electron_25; - in -buildNpmPackage { +stdenv.mkDerivation (finalAttrs: { inherit pname version src; - nativeBuildInputs = [ makeWrapper python3 ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + pnpmDeps = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version ELECTRON_SKIP_BINARY_DOWNLOAD; + + nativeBuildInputs = [ jq moreutils nodePackages.pnpm cacert ]; + + installPhase = '' + export HOME=$(mktemp -d) - npmDepsHash = "sha256-XGV0mTywYYxpMitojzIILB/Eu/8dfk/aCvUxIkx4SDQ="; - makeCacheWritable = true; + pnpm config set store-dir $out + pnpm install --frozen-lockfile --ignore-script - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f + jq --sort-keys . $f | sponge $f + done + ''; + + dontBuild = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = { + x86_64-linux = "sha256-Oy11V7FXfVhLUR9gX0sjQEFuVPFpbaVdT518oOSLcvA="; + aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI="; + x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY="; + aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs="; + }.${stdenv.system} or (throw "Unsupported platform"); }; + nativeBuildInputs = + [ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ] + ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + + + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + preBuild = '' + export HOME=$(mktemp -d) + export STORE_PATH=$(mktemp -d) + + cp -Tr "$pnpmDeps" "$STORE_PATH" + chmod -R +w "$STORE_PATH" + + pnpm config set store-dir "$STORE_PATH" + pnpm install --offline --frozen-lockfile --ignore-script + patchShebangs node_modules/{*,.*} + ''; + postBuild = lib.optionalString stdenv.isDarwin '' cp -R ${electron}/Applications/Electron.app Electron.app chmod -R u+w Electron.app '' + '' - npm exec electron-builder -- \ + pnpm build + ./node_modules/.bin/electron-builder \ --dir \ -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ -c.electronVersion=${electron.version} @@ -83,7 +127,7 @@ buildNpmPackage { icon = "youtube-music"; desktopName = "Youtube Music"; startupWMClass = "Youtube Music"; - categories = ["AudioVideo"]; + categories = [ "AudioVideo" ]; }) ]; @@ -93,6 +137,6 @@ buildNpmPackage { license = licenses.mit; maintainers = [ maintainers.aacebedo ]; mainProgram = "youtube-music"; - platforms = platforms.all; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} +}) |