Merge pull request #114290 from sternenseemann/missing-libs
treewide: add missing lib inputs
This commit is contained in:
commit
3371fe2c9b
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "CharacterCompressor";
|
pname = "CharacterCompressor";
|
||||||
version = "0.3.3";
|
version = "0.3.3";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "CompBus";
|
pname = "CompBus";
|
||||||
version = "1.1.1";
|
version = "1.1.1";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "constant-detune-chorus";
|
pname = "constant-detune-chorus";
|
||||||
version = "0.1.3";
|
version = "0.1.3";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "LazyLimiter";
|
pname = "LazyLimiter";
|
||||||
version = "0.3.2";
|
version = "0.3.2";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "MBdistortion";
|
pname = "MBdistortion";
|
||||||
version = "1.1.1";
|
version = "1.1.1";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "RhythmDelay";
|
pname = "RhythmDelay";
|
||||||
version = "2.1";
|
version = "2.1";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
|
{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "VoiceOfFaust";
|
pname = "VoiceOfFaust";
|
||||||
version = "1.1.4";
|
version = "1.1.4";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "faustCompressors-v${version}";
|
name = "faustCompressors-v${version}";
|
||||||
version = "1.2";
|
version = "1.2";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pluginUtils";
|
pname = "pluginUtils";
|
||||||
version = "1.1";
|
version = "1.1";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "shelfMultiBand";
|
pname = "shelfMultiBand";
|
||||||
version = "0.6.1";
|
version = "0.6.1";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
|
{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
|
||||||
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
|
freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, haskell, spass }:
|
{ lib, stdenv, fetchurl, haskell, spass }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "system-for-automated-deduction-2.3.25";
|
name = "system-for-automated-deduction-2.3.25";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ newScope } :
|
{ lib, newScope } :
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
callPackage = newScope self;
|
||||||
|
|
||||||
|
@ -18,4 +18,4 @@ let
|
||||||
egg2nix = callPackage ./egg2nix.nix { };
|
egg2nix = callPackage ./egg2nix.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
in self
|
in lib.recurseIntoAttrs self
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ eggDerivation, fetchurl, chickenEggs }:
|
{ lib, eggDerivation, fetchurl, chickenEggs }:
|
||||||
|
|
||||||
# Note: This mostly reimplements the default.nix already contained in
|
# Note: This mostly reimplements the default.nix already contained in
|
||||||
# the tarball. Is there a nicer way than duplicating code?
|
# the tarball. Is there a nicer way than duplicating code?
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ newScope } :
|
{ lib, newScope } :
|
||||||
let
|
let
|
||||||
callPackage = newScope self;
|
callPackage = newScope self;
|
||||||
|
|
||||||
|
@ -18,4 +18,4 @@ let
|
||||||
egg2nix = callPackage ./egg2nix.nix { };
|
egg2nix = callPackage ./egg2nix.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
in self
|
in lib.recurseIntoAttrs self
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ fetchsvn, stdenv, gnum4, tet }:
|
{ lib, fetchsvn, stdenv, gnum4, tet }:
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
version = "3258";
|
version = "3258";
|
||||||
|
@ -8,6 +8,7 @@ stdenv.mkDerivation (rec {
|
||||||
url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
|
url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk";
|
||||||
rev = (lib.strings.toInt version);
|
rev = (lib.strings.toInt version);
|
||||||
name = "elftoolchain-${version}";
|
name = "elftoolchain-${version}";
|
||||||
|
sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gnum4 tet ];
|
buildInputs = [ gnum4 tet ];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
|
{ lib, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
|
||||||
, src, version, hasBootstrapScript, postPatch ? ""
|
, src, version, hasBootstrapScript, postPatch ? ""
|
||||||
, ... }:
|
, ... }:
|
||||||
let
|
let
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
, runtimeShell
|
, runtimeShell
|
||||||
, unstableGitUpdater
|
, unstableGitUpdater
|
||||||
|
|
||||||
# Attributes needed for tests of the external plugins
|
# external plugins package set
|
||||||
, callPackage, beets
|
, beetsExternalPlugins
|
||||||
|
|
||||||
, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
|
, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
|
||||||
, enableAcousticbrainz ? true
|
, enableAcousticbrainz ? true
|
||||||
|
@ -116,15 +116,6 @@ let
|
||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
pluginArgs = externalTestArgs // { inherit pythonPackages; };
|
|
||||||
|
|
||||||
plugins = {
|
|
||||||
alternatives = callPackage ./plugins/alternatives.nix pluginArgs;
|
|
||||||
check = callPackage ./plugins/check.nix pluginArgs;
|
|
||||||
copyartifacts = callPackage ./plugins/copyartifacts.nix pluginArgs;
|
|
||||||
extrafiles = callPackage ./plugins/extrafiles.nix pluginArgs;
|
|
||||||
};
|
|
||||||
|
|
||||||
in pythonPackages.buildPythonApplication rec {
|
in pythonPackages.buildPythonApplication rec {
|
||||||
pname = "beets";
|
pname = "beets";
|
||||||
# While there is a stable version, 1.4.9, it is more than 1000 commits behind
|
# While there is a stable version, 1.4.9, it is more than 1000 commits behind
|
||||||
|
@ -169,7 +160,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||||
|| enableSubsonicupdate
|
|| enableSubsonicupdate
|
||||||
|| enableAcousticbrainz)
|
|| enableAcousticbrainz)
|
||||||
pythonPackages.requests
|
pythonPackages.requests
|
||||||
++ optional enableCheck plugins.check
|
++ optional enableCheck beetsExternalPlugins.check
|
||||||
++ optional enableConvert ffmpeg
|
++ optional enableConvert ffmpeg
|
||||||
++ optional enableDiscogs pythonPackages.discogs_client
|
++ optional enableDiscogs pythonPackages.discogs_client
|
||||||
++ optional enableGmusic pythonPackages.gmusicapi
|
++ optional enableGmusic pythonPackages.gmusicapi
|
||||||
|
@ -179,9 +170,9 @@ in pythonPackages.buildPythonApplication rec {
|
||||||
++ optional enableSonosUpdate pythonPackages.soco
|
++ optional enableSonosUpdate pythonPackages.soco
|
||||||
++ optional enableThumbnails pythonPackages.pyxdg
|
++ optional enableThumbnails pythonPackages.pyxdg
|
||||||
++ optional enableWeb pythonPackages.flask
|
++ optional enableWeb pythonPackages.flask
|
||||||
++ optional enableAlternatives plugins.alternatives
|
++ optional enableAlternatives beetsExternalPlugins.alternatives
|
||||||
++ optional enableCopyArtifacts plugins.copyartifacts
|
++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
|
||||||
++ optional enableExtraFiles plugins.extrafiles
|
++ optional enableExtraFiles beetsExternalPlugins.extrafiles
|
||||||
;
|
;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -289,7 +280,8 @@ in pythonPackages.buildPythonApplication rec {
|
||||||
makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ];
|
makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
externalPlugins = plugins;
|
# FIXME: remove in favor of pkgs.beetsExternalPlugins
|
||||||
|
externalPlugins = beetsExternalPlugins;
|
||||||
updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
|
updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ fetchFromGitHub, beets, pythonPackages }:
|
{ lib, fetchFromGitHub, beets, pythonPackages }:
|
||||||
|
|
||||||
pythonPackages.buildPythonApplication rec {
|
pythonPackages.buildPythonApplication rec {
|
||||||
pname = "beets-alternatives";
|
pname = "beets-alternatives";
|
||||||
|
|
|
@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
|
||||||
propagatedBuildInputs = [ flac liboggz mp3val ];
|
propagatedBuildInputs = [ flac liboggz mp3val ];
|
||||||
|
|
||||||
# patch out broken tests
|
# patch out broken tests
|
||||||
patches = [ ./beet-check-tests.patch ];
|
patches = [ ./check-tests.patch ];
|
||||||
|
|
||||||
# patch out futures dependency, it is only needed for Python2 which we don't
|
# patch out futures dependency, it is only needed for Python2 which we don't
|
||||||
# support.
|
# support.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ fetchFromGitHub, beets, pythonPackages, glibcLocales }:
|
{ lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
|
||||||
|
|
||||||
pythonPackages.buildPythonApplication {
|
pythonPackages.buildPythonApplication {
|
||||||
name = "beets-copyartifacts";
|
name = "beets-copyartifacts";
|
||||||
|
|
|
@ -3009,6 +3009,26 @@ in
|
||||||
pythonPackages = python3Packages;
|
pythonPackages = python3Packages;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
beetsExternalPlugins =
|
||||||
|
let
|
||||||
|
pluginArgs = {
|
||||||
|
# This is a stripped down beets for testing of the external plugins.
|
||||||
|
beets = (beets.override {
|
||||||
|
enableAlternatives = false;
|
||||||
|
enableCopyArtifacts = false;
|
||||||
|
enableExtraFiles = false;
|
||||||
|
}).overrideAttrs (lib.const {
|
||||||
|
doInstallCheck = false;
|
||||||
|
});
|
||||||
|
pythonPackages = python3Packages;
|
||||||
|
};
|
||||||
|
in lib.recurseIntoAttrs {
|
||||||
|
alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs;
|
||||||
|
check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs;
|
||||||
|
copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs;
|
||||||
|
extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs;
|
||||||
|
};
|
||||||
|
|
||||||
bento4 = callPackage ../tools/video/bento4 { };
|
bento4 = callPackage ../tools/video/bento4 { };
|
||||||
|
|
||||||
bepasty = callPackage ../tools/misc/bepasty { };
|
bepasty = callPackage ../tools/misc/bepasty { };
|
||||||
|
@ -23605,7 +23625,7 @@ in
|
||||||
|
|
||||||
mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
|
mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
|
||||||
|
|
||||||
magnetophonDSP = {
|
magnetophonDSP = lib.recurseIntoAttrs {
|
||||||
CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
|
CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
|
||||||
CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };
|
CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };
|
||||||
ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { };
|
ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { };
|
||||||
|
|
Loading…
Reference in a new issue