diff options
| author | Bart Brouns <bart@magnetophon.nl> | 2020-01-20 11:14:03 +0100 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2020-01-20 16:22:48 +0100 |
| commit | a6ecbc4443d5cd2a162b51e1209c82a40cbd237c (patch) | |
| tree | 8a639b923bbd1f8ca3bb8f047a8660a91648db58 | |
| parent | 7450bb75c0b7552cdd25652aedfaae911a655a6f (diff) | |
| download | nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.tar nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.tar.gz nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.tar.bz2 nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.tar.lz nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.tar.xz nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.tar.zst nixpkgs-a6ecbc4443d5cd2a162b51e1209c82a40cbd237c.zip | |
ingen: unstable-2017-07-22 unstable-2019-12-09
| -rw-r--r-- | pkgs/applications/audio/ingen/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/audio/lv2/unstable.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 9 insertions, 32 deletions
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 1e249b51fb7..9d3fb6aae40 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , wafHook , suil }: stdenv.mkDerivation rec { - name = "ingen-unstable-${rev}"; - rev = "2017-07-22"; + pname = "ingen"; + version = "unstable-2019-12-09"; + name = "${pname}-${version}"; src = fetchgit { - url = "https://git.drobilla.net/cgit.cgi/ingen.git"; - rev = "cc4a4db33f4d126a07a4a498e053c5fb9a883be3"; - sha256 = "1gmwmml486r9zq4w65v91mfaz36af9zzyjkmi74m8qmh67ffqn3w"; + url = "https://gitlab.com/drobilla/ingen.git"; + rev = "e32f32a360f2bf8f017ea347b6d1e568c0beaf68"; + sha256 = "0wjn2i3j7jb0bmxymg079xpk4iplb91q0xqqnvnpvyldrr7gawlb"; deepClone = true; }; nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper + boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper python raul serd sord sratom suil ]; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; homepage = http://drobilla.net/software/ingen; - license = licenses.gpl3; + license = licenses.agpl3Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix deleted file mode 100644 index 6f10283b07b..00000000000 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: - -stdenv.mkDerivation { - pname = "lv2-unstable"; - version = "2017-07-08"; - - src = fetchgit { - url = "http://lv2plug.in/git/cgit.cgi/lv2.git"; - rev = "39c7c726cd52b2863fcea356cafe1bcab2ba7f37"; - sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r"; - }; - - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ gtk2 libsndfile python ]; - - meta = with stdenv.lib; { - homepage = http://lv2plug.in; - description = "A plugin standard for audio systems"; - license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bb7da68843..ee74eb17f31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14017,7 +14017,6 @@ in lilv = callPackage ../development/libraries/audio/lilv { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; - lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; lvtk = callPackage ../development/libraries/audio/lvtk { }; |