From ea4d01b8574c125c6ac98fb4d241c95c7e8a6495 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 07:50:38 +0100 Subject: [PATCH 1/8] Added libopencore support --- pkgs/development/libraries/libopencore/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 pkgs/development/libraries/libopencore/default.nix diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix new file mode 100644 index 000000000000..1d64c36a1449 --- /dev/null +++ b/pkgs/development/libraries/libopencore/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "opencore-amr"; + src = fetchurl { + url = https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz; + sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + }; + +} From 21b6e9cc050385508c147cb2a553b63935fdef9e Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 08:07:55 +0100 Subject: [PATCH 2/8] Add kiloreux as maintainer --- lib/maintainers.nix | 1 + pkgs/development/libraries/libopencore/default.nix | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 048d8c4760e3..4c94ab396191 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -292,6 +292,7 @@ khumba = "Bryan Gardiner "; KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; + kilourex = "Kiloreux Emperex "; kkallio = "Karn Kallio "; knedlsepp = "Josef Kemetmüller "; konimex = "Muhammad Herdiansyah "; diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix index 1d64c36a1449..6eacfdb63713 100644 --- a/pkgs/development/libraries/libopencore/default.nix +++ b/pkgs/development/libraries/libopencore/default.nix @@ -6,5 +6,11 @@ stdenv.mkDerivation { url = https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; }; - + meta = { + homepage = https://opencore-amr.sourceforge.io/; + description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. + Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.kiloreux ]; + }; } From 6f7f06375c5dd115f57d63e12d8d8c9957abe5fa Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 09:43:23 +0100 Subject: [PATCH 3/8] Implement required changes --- pkgs/development/libraries/libopencore/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix index 6eacfdb63713..6dbd190e7c96 100644 --- a/pkgs/development/libraries/libopencore/default.nix +++ b/pkgs/development/libraries/libopencore/default.nix @@ -1,11 +1,15 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }; +let + version = "0.1.5"; +in stdenv.mkDerivation { - name = "opencore-amr"; + name = "opencore-amr-${version}"; src = fetchurl { - url = https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.5.tar.gz; + url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; }; + meta = { homepage = https://opencore-amr.sourceforge.io/; description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. From 2ff9f969a16035c8c03c70d04239461e01f0ad92 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 10:09:17 +0100 Subject: [PATCH 4/8] Added libopencore to all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f32cc4cee3c..378f334c45f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4682,6 +4682,8 @@ with pkgs; openssl = null; }; + opencore-amr = callPackage ../development/libraries/libopencore { }; + ding-libs = callPackage ../tools/misc/ding-libs { }; sssd = callPackage ../os-specific/linux/sssd { From 6a279ec77aff4688ac5322581de8329d420ac3e5 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 10:27:41 +0100 Subject: [PATCH 5/8] Fix typo --- pkgs/development/libraries/libopencore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/libopencore/default.nix index 6dbd190e7c96..9a8787ad7f49 100644 --- a/pkgs/development/libraries/libopencore/default.nix +++ b/pkgs/development/libraries/libopencore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }; +{ stdenv, fetchurl }: let version = "0.1.5"; From 49fd201ea35c23cd57f18c9b8bdfa07b765c5790 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 15:44:05 +0100 Subject: [PATCH 6/8] Fix typo --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4c94ab396191..7a997e925796 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -292,7 +292,7 @@ khumba = "Bryan Gardiner "; KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; - kilourex = "Kiloreux Emperex "; + kiloruex = "Kiloreux Emperex "; kkallio = "Karn Kallio "; knedlsepp = "Josef Kemetmüller "; konimex = "Muhammad Herdiansyah "; From 66e5a9f43f65aa2685edc5e0d932ae14c6d52686 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 17:09:19 +0100 Subject: [PATCH 7/8] Fix typo --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7a997e925796..a4ea5ecab529 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -292,7 +292,7 @@ khumba = "Bryan Gardiner "; KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; - kiloruex = "Kiloreux Emperex "; + kiloreux = "Kiloreux Emperex "; kkallio = "Karn Kallio "; knedlsepp = "Josef Kemetmüller "; konimex = "Muhammad Herdiansyah "; From c74d0d460f3070de23fd55fc81822d23bc0bd686 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Tue, 8 Aug 2017 17:36:15 +0100 Subject: [PATCH 8/8] Implement other required changes --- .../libraries/{libopencore => opencore-amr}/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/libraries/{libopencore => opencore-amr}/default.nix (100%) diff --git a/pkgs/development/libraries/libopencore/default.nix b/pkgs/development/libraries/opencore-amr/default.nix similarity index 100% rename from pkgs/development/libraries/libopencore/default.nix rename to pkgs/development/libraries/opencore-amr/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 378f334c45f7..e4adb1e282b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4682,8 +4682,6 @@ with pkgs; openssl = null; }; - opencore-amr = callPackage ../development/libraries/libopencore { }; - ding-libs = callPackage ../tools/misc/ding-libs { }; sssd = callPackage ../os-specific/linux/sssd { @@ -9640,6 +9638,8 @@ with pkgs; opencollada = callPackage ../development/libraries/opencollada { }; + opencore-amr = callPackage ../development/libraries/opencore-amr { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { };