From 9841a891ef1835dab14ed1bcf9b283a3450a0768 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 30 May 2020 13:34:16 +0200 Subject: [PATCH 1/2] molot-lite: init at unstable-2014-04-23 --- pkgs/applications/audio/molot-lite/base.nix | 26 +++++++++++++++++++ .../applications/audio/molot-lite/default.nix | 14 ++++++++++ pkgs/applications/audio/molot-lite/mono.nix | 18 +++++++++++++ pkgs/applications/audio/molot-lite/stereo.nix | 18 +++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 5 files changed, 80 insertions(+) create mode 100644 pkgs/applications/audio/molot-lite/base.nix create mode 100644 pkgs/applications/audio/molot-lite/default.nix create mode 100644 pkgs/applications/audio/molot-lite/mono.nix create mode 100644 pkgs/applications/audio/molot-lite/stereo.nix diff --git a/pkgs/applications/audio/molot-lite/base.nix b/pkgs/applications/audio/molot-lite/base.nix new file mode 100644 index 000000000000..44880f74901a --- /dev/null +++ b/pkgs/applications/audio/molot-lite/base.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +rec { + version = "unstable-2014-04-23"; + + src = fetchurl { + # the source is zipped inside the repository, so this doesn't work: + # url = "mirror://sourceforge/molot/molot_src.zip"; + url = "https://sourceforge.net/p/molot/code/ci/master/tree/molot_src.zip?format=raw"; + sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + }; + + buildInputs = [ unzip lv2 ]; + + unpackPhase = "unzip $src"; + + installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; + + meta = with stdenv.lib; { + description = "a stereo and mono audio signal dynamic range compressor in LV2 format"; + homepage = "https://sourceforge.net/projects/molot/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix new file mode 100644 index 000000000000..bb858e10644b --- /dev/null +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -0,0 +1,14 @@ +{ stdenvNoCC, molot-mono-lite, molot-stereo-lite }: +with stdenvNoCC.lib; + + +stdenvNoCC.mkDerivation { + pname = "molot-lite"; + version = molot-mono-lite.version; + + buildCommand = '' + mkdir -p $out/lib/lv2/ + ln -s ${makeLibraryPath [molot-mono-lite]}/lv2/Molot_Mono_Lite.lv2 $out/lib/lv2 + ln -s ${makeLibraryPath [molot-stereo-lite]}/lv2/Molot_Stereo_Lite.lv2 $out/lib/lv2 + ''; +} diff --git a/pkgs/applications/audio/molot-lite/mono.nix b/pkgs/applications/audio/molot-lite/mono.nix new file mode 100644 index 000000000000..dd2f0e3261aa --- /dev/null +++ b/pkgs/applications/audio/molot-lite/mono.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +let + base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; +in +stdenv.mkDerivation { + pname = "molot-mono-lite"; + + version = base.version; + src = base.src; + unpackPhase = base.unpackPhase; + buildInputs = base.buildInputs; + installFlags = base.installFlags; + + prePatch = '' + cd Molot_Mono_Lite + ''; +} diff --git a/pkgs/applications/audio/molot-lite/stereo.nix b/pkgs/applications/audio/molot-lite/stereo.nix new file mode 100644 index 000000000000..3cf59868930f --- /dev/null +++ b/pkgs/applications/audio/molot-lite/stereo.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +let + base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; +in +stdenv.mkDerivation { + pname = "molot-stereo-lite"; + + version = base.version; + src = base.src; + unpackPhase = base.unpackPhase; + buildInputs = base.buildInputs; + installFlags = base.installFlags; + + prePatch = '' + cd Molot_Stereo_Lite + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15825b5a66..23465fb3f581 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21496,6 +21496,10 @@ in xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + molot-lite = callPackage ../applications/audio/molot-lite { }; + molot-mono-lite = callPackage ../applications/audio/molot-lite/mono.nix { }; + molot-stereo-lite = callPackage ../applications/audio/molot-lite/stereo.nix { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; From bf838029d74819ba44292357c8df380966e0b827 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 18 Aug 2020 20:30:59 +0000 Subject: [PATCH 2/2] molot-lite: simplify definition --- pkgs/applications/audio/molot-lite/base.nix | 26 ------------ .../applications/audio/molot-lite/default.nix | 41 +++++++++++++++---- pkgs/applications/audio/molot-lite/mono.nix | 18 -------- pkgs/applications/audio/molot-lite/stereo.nix | 18 -------- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 32 insertions(+), 73 deletions(-) delete mode 100644 pkgs/applications/audio/molot-lite/base.nix delete mode 100644 pkgs/applications/audio/molot-lite/mono.nix delete mode 100644 pkgs/applications/audio/molot-lite/stereo.nix diff --git a/pkgs/applications/audio/molot-lite/base.nix b/pkgs/applications/audio/molot-lite/base.nix deleted file mode 100644 index 44880f74901a..000000000000 --- a/pkgs/applications/audio/molot-lite/base.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, unzip, lv2 }: - -rec { - version = "unstable-2014-04-23"; - - src = fetchurl { - # the source is zipped inside the repository, so this doesn't work: - # url = "mirror://sourceforge/molot/molot_src.zip"; - url = "https://sourceforge.net/p/molot/code/ci/master/tree/molot_src.zip?format=raw"; - sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; - }; - - buildInputs = [ unzip lv2 ]; - - unpackPhase = "unzip $src"; - - installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; - - meta = with stdenv.lib; { - description = "a stereo and mono audio signal dynamic range compressor in LV2 format"; - homepage = "https://sourceforge.net/projects/molot/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix index bb858e10644b..5c5aa5055370 100644 --- a/pkgs/applications/audio/molot-lite/default.nix +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -1,14 +1,37 @@ -{ stdenvNoCC, molot-mono-lite, molot-stereo-lite }: -with stdenvNoCC.lib; +{ stdenv, fetchurl, unzip, lv2 }: - -stdenvNoCC.mkDerivation { +stdenv.mkDerivation { pname = "molot-lite"; - version = molot-mono-lite.version; + version = "unstable-2014-04-23"; - buildCommand = '' - mkdir -p $out/lib/lv2/ - ln -s ${makeLibraryPath [molot-mono-lite]}/lv2/Molot_Mono_Lite.lv2 $out/lib/lv2 - ln -s ${makeLibraryPath [molot-stereo-lite]}/lv2/Molot_Stereo_Lite.lv2 $out/lib/lv2 + src = fetchurl { + # fetchzip does not accept urls that do not end with .zip. + url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw"; + sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ lv2 ]; + + unpackPhase = '' + unzip $src ''; + + buildPhase = '' + make -C Molot_Mono_Lite + make -C Molot_Stereo_Lite + ''; + + installPhase = '' + make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite + make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite + ''; + + meta = with stdenv.lib; { + description = "Stereo and mono audio signal dynamic range compressor in LV2 format"; + homepage = "https://sourceforge.net/projects/molot/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/audio/molot-lite/mono.nix b/pkgs/applications/audio/molot-lite/mono.nix deleted file mode 100644 index dd2f0e3261aa..000000000000 --- a/pkgs/applications/audio/molot-lite/mono.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, unzip, lv2 }: - -let - base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; -in -stdenv.mkDerivation { - pname = "molot-mono-lite"; - - version = base.version; - src = base.src; - unpackPhase = base.unpackPhase; - buildInputs = base.buildInputs; - installFlags = base.installFlags; - - prePatch = '' - cd Molot_Mono_Lite - ''; -} diff --git a/pkgs/applications/audio/molot-lite/stereo.nix b/pkgs/applications/audio/molot-lite/stereo.nix deleted file mode 100644 index 3cf59868930f..000000000000 --- a/pkgs/applications/audio/molot-lite/stereo.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, unzip, lv2 }: - -let - base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; -in -stdenv.mkDerivation { - pname = "molot-stereo-lite"; - - version = base.version; - src = base.src; - unpackPhase = base.unpackPhase; - buildInputs = base.buildInputs; - installFlags = base.installFlags; - - prePatch = '' - cd Molot_Stereo_Lite - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23465fb3f581..692915169942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21497,8 +21497,6 @@ in xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; - molot-mono-lite = callPackage ../applications/audio/molot-lite/mono.nix { }; - molot-stereo-lite = callPackage ../applications/audio/molot-lite/stereo.nix { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { };