Merge pull request #141918 from sternenseemann/remove-fluidsynth-1

authored by

Sandro and committed by
GitHub
52abab8c 45e2dc61

+15 -22
+8
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 1176 1176 will no longer work and must be updated. 1177 1177 </para> 1178 1178 </listitem> 1179 + <listitem> 1180 + <para> 1181 + The <literal>fluidsynth_1</literal> attribute has been 1182 + removed, as this legacy version is no longer needed in 1183 + nixpkgs. The actively maintained 2.x series is available as 1184 + <literal>fluidsynth</literal> unchanged. 1185 + </para> 1186 + </listitem> 1179 1187 </itemizedlist> 1180 1188 </section> 1181 1189 <section xml:id="sec-release-21.11-notable-changes">
+2
nixos/doc/manual/release-notes/rl-2111.section.md
··· 362 362 - The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration. 363 363 Module configurations from previous releases will no longer work and must be updated. 364 364 365 + - The `fluidsynth_1` attribute has been removed, as this legacy version is no longer needed in nixpkgs. The actively maintained 2.x series is available as `fluidsynth` unchanged. 366 + 365 367 ## Other Notable Changes {#sec-release-21.11-notable-changes} 366 368 367 369
+5 -21
pkgs/applications/audio/fluidsynth/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, pkg-config, cmake 2 2 , alsa-lib, glib, libjack2, libsndfile, libpulseaudio 3 3 , AudioUnit, CoreAudio, CoreMIDI, CoreServices 4 - , version ? "2" 5 4 }: 6 5 7 - let 8 - versionMap = { 9 - "1" = { 10 - fluidsynthVersion = "1.1.11"; 11 - sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; 12 - }; 13 - "2" = { 14 - fluidsynthVersion = "2.2.3"; 15 - sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3"; 16 - }; 17 - }; 18 - in 19 - 20 - with versionMap.${version}; 21 - 22 - stdenv.mkDerivation { 23 - name = "fluidsynth-${fluidsynthVersion}"; 24 - version = fluidsynthVersion; 6 + stdenv.mkDerivation rec { 7 + pname = "fluidsynth"; 8 + version = "2.2.3"; 25 9 26 10 src = fetchFromGitHub { 27 11 owner = "FluidSynth"; 28 12 repo = "fluidsynth"; 29 - rev = "v${fluidsynthVersion}"; 30 - inherit sha256; 13 + rev = "v${version}"; 14 + sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3"; 31 15 }; 32 16 33 17 nativeBuildInputs = [ pkg-config cmake ];
-1
pkgs/top-level/all-packages.nix
··· 24662 24662 fluidsynth = callPackage ../applications/audio/fluidsynth { 24663 24663 inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; 24664 24664 }; 24665 - fluidsynth_1 = fluidsynth.override { version = "1"; }; 24666 24665 24667 24666 fmit = libsForQt5.callPackage ../applications/audio/fmit { }; 24668 24667