Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e6afa8cb127
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 915ce0f1e1a7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Apr 29, 2019

  1. [soundkonverter] init at 3.0.1

    (cherry picked from commit 7218dec)
    schmittlauch committed Apr 29, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    Copy the full SHA
    e028941 View commit details

Commits on May 2, 2019

  1. zoom-us: 2.7.162522.0121 -> 2.8.182821.0412

    (cherry picked from commit 1f219af)
    NeQuissimus authored and flokli committed May 2, 2019
    Copy the full SHA
    2e469f9 View commit details
  2. zoom-us: 2.8.182821.0412 -> 2.8.183302.0415

    (cherry picked from commit 2633767)
    NeQuissimus authored and flokli committed May 2, 2019
    Copy the full SHA
    10291a7 View commit details
  3. Merge pull request #60408 from schmittlauch/soundkonverter-backport

    [soundkonverter] init at 3.0.1
    Mic92 authored May 2, 2019
    Copy the full SHA
    915ce0f View commit details
97 changes: 97 additions & 0 deletions pkgs/applications/audio/soundkonverter/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
{
mkDerivation, fetchFromGitHub, lib, makeWrapper,
cmake, extra-cmake-modules, pkgconfig,
libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
qtbase, phonon,
taglib,
# optional backends
withCD ? true, cdparanoia,
withFlac ? true, flac,
withMidi ? true, fluidsynth, timidity,
withSpeex ? false, speex,
withVorbis ? true, vorbis-tools, vorbisgain,
withMp3 ? true, lame, mp3gain,
withAac ? true, faad2, aacgain,
withUnfreeAac ? false, faac,
withFfmpeg ? true, ffmpeg-full,
withMplayer ? false, mplayer,
withSox ? true, sox,
withOpus ? true, opusTools,
withTwolame ? false, twolame,
withApe ? false, mac,
withWavpack ? false, wavpack
}:

assert withAac -> withFfmpeg || withUnfreeAac;
assert withUnfreeAac -> withAac;

let runtimeDeps = []
++ lib.optional withCD cdparanoia
++ lib.optional withFlac flac
++ lib.optional withSpeex speex
++ lib.optional withFfmpeg ffmpeg-full
++ lib.optional withMplayer mplayer
++ lib.optional withSox sox
++ lib.optional withOpus opusTools
++ lib.optional withTwolame twolame
++ lib.optional withApe mac
++ lib.optional withWavpack wavpack
++ lib.optional withUnfreeAac faac
++ lib.optionals withMidi [ fluidsynth timidity ]
++ lib.optionals withVorbis [ vorbis-tools vorbisgain ]
++ lib.optionals withMp3 [ lame mp3gain ]
++ lib.optionals withAac [ faad2 aacgain ];

in
mkDerivation rec {
name = "soundkonverter";
version = "3.0.1";
src = fetchFromGitHub {
owner = "dfaust";
repo = "soundkonverter";
rev = "v" + version;
sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
buildInputs = [ taglib ] ++ runtimeDeps;
# encoder plugins go to ${out}/lib so they're found by kbuildsycoca5
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ];
sourceRoot = "source/src";
# add runt-time deps to PATH
postInstall = ''
wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps }
'';
meta = {
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.schmittlauch ];
description = "Audio file converter, CD ripper and Replay Gain tool";
longDescription = ''
soundKonverter is a frontend to various audio converters.
The key features are:
- Audio file conversion
- Replay Gain calculation
- CD ripping
soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files.
It is extendable by plugins and supports many backends including:
- Audio file conversion
Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame,
flake, mac, shorten, wavpack and speex
Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten,
tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv
- Replay Gain calculation
Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain
Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack
- CD ripping
Backends: cdparanoia
'';
};
}
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;

version = "2.7.162522.0121";
version = "2.8.183302.0415";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
sha256 = "01i4g4kmawk3mclifh4bwcqpdnbvrz0sz49b6l33n0k5ysky20r1";
sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x";
};
};

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -5590,6 +5590,8 @@ in

sonata = callPackage ../applications/audio/sonata { };

soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {};

souper = callPackage ../development/compilers/souper { };

sparsehash = callPackage ../development/libraries/sparsehash { };