diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 908d2cf7fbe0..aad4a1e15ef0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1176,6 +1176,14 @@ Superuser created successfully. 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. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 645bcf6d4770..9b9766db3043 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -362,6 +362,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} diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index fa53bee5dc8d..0af7b6b1f959 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a662fa4afe8f..170d484c3b66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24662,7 +24662,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 { };