fluidsynth_1: remove at 1.1.11

* FluidSynth 1.1.11 was kept around as a dependency of some packages
  that hadn't yet adjusted to API breakages. All of these packages now
  use FluidSynth 2.x, so fluidsynth_1 can be removed. It has been broken
  ever since glib was updated to 2.70 and was affected by an unpatched
  CVE.

* Refactor expression a bit, use pname instead of name.

* Add changelog entry in case someone was using this downstream
  (accidentally?).

Fixes #141508.
Fixes #124624.
main
sternenseemann 3 years ago
parent 93de7f2421
commit 45b312013e
  1. 8
      nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
  2. 2
      nixos/doc/manual/release-notes/rl-2111.section.md
  3. 26
      pkgs/applications/audio/fluidsynth/default.nix
  4. 1
      pkgs/top-level/all-packages.nix

@ -1160,6 +1160,14 @@ Superuser created successfully.
will no longer work and must be updated.
</para>
</listitem>
<listitem>
<para>
The <literal>fluidsynth_1</literal> attribute has been
removed, as this legacy version is no longer needed in
nixpkgs. The actively maintained 2.x series is available as
<literal>fluidsynth</literal> unchanged.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

@ -358,6 +358,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration.
Module configurations from previous releases will no longer work and must be updated.
- 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.
## Other Notable Changes {#sec-release-21.11-notable-changes}

@ -1,33 +1,17 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
, version ? "2"
}:
let
versionMap = {
"1" = {
fluidsynthVersion = "1.1.11";
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
};
"2" = {
fluidsynthVersion = "2.2.3";
sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
};
};
in
with versionMap.${version};
stdenv.mkDerivation {
name = "fluidsynth-${fluidsynthVersion}";
version = fluidsynthVersion;
stdenv.mkDerivation rec {
pname = "fluidsynth";
version = "2.2.3";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${fluidsynthVersion}";
inherit sha256;
rev = "v${version}";
sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
};
nativeBuildInputs = [ pkg-config cmake ];

@ -24638,7 +24638,6 @@ with pkgs;
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
};
fluidsynth_1 = fluidsynth.override { version = "1"; };
fmit = libsForQt5.callPackage ../applications/audio/fmit { };

Loading…
Cancel
Save