From 2561f4da88fc12c17804287e0a1825b3a7fc37dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Nov 2019 00:31:35 +0100 Subject: [PATCH 1/3] =?UTF-8?q?ofono:=201.30=20=E2=86=92=201.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?h=1.31&id=0db662bd6ba4070838bf143df5ee24c949a8c0df --- pkgs/tools/networking/ofono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 27f4b9562b38..5cae8a612033 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.30"; + version = "1.31"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "1qzysmzpgbh6zc3x9xh931wxcazka9wwx727c2k66z9gal2n6n66"; + sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy"; }; patches = [ From c0acd27c6ecc7fe9583bb7fec87fbe93a7a6b771 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Nov 2019 00:37:24 +0100 Subject: [PATCH 2/3] =?UTF-8?q?ofono-phonesim:=20unstable-2014-04-22=20?= =?UTF-8?q?=E2=86=92=20unstable-2019-11-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jussi’s repo was actually a fork. Upstream was ported from Qt4 to Qt5 and from QScript to QML on master. --- .../tools/ofono-phonesim/default.nix | 21 +++----- .../tools/ofono-phonesim/qt5-compat.patch | 48 ------------------- 2 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 pkgs/development/tools/ofono-phonesim/qt5-compat.patch diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index cc33b675954a..e62827c67b49 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,27 +1,21 @@ { stdenv , mkDerivation -, fetchFromGitHub +, fetchgit , autoreconfHook , pkgconfig , qtbase -, qtscript }: mkDerivation { pname = "ofono-phonesim"; - version = "unstable-2014-04-22"; + version = "unstable-2019-11-18"; - src = fetchFromGitHub { - owner = "jpakkane"; - repo = "ofono-phonesim"; - rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a"; - sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; + rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; + sha256 = "sha256:1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; - patches = [ - ./qt5-compat.patch - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig @@ -29,7 +23,6 @@ mkDerivation { buildInputs = [ qtbase - qtscript ]; makeFlags = [ @@ -39,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Phone Simulator for modem testing"; - homepage = https://github.com/jpakkane/ofono-phonesim; + homepage = "https://01.org/ofono"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch b/pkgs/development/tools/ofono-phonesim/qt5-compat.patch deleted file mode 100644 index e2e9dcebd6bc..000000000000 --- a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2436292..993df87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], - fi - ]) - --PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes, -+PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes, - AC_MSG_ERROR(Qt is required)) - AC_SUBST(QT_CFLAGS) - AC_SUBST(QT_LIBS) - - AC_MSG_CHECKING(for moc) --MOC="`$PKG_CONFIG --variable=moc_location QtCore`" -+MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`" - AC_SUBST(MOC) - AC_MSG_RESULT($MOC) - - AC_MSG_CHECKING(for uic) --UIC="`$PKG_CONFIG --variable=uic_location QtCore`" -+UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`" - AC_SUBST(UIC) - AC_MSG_RESULT($UIC) - -diff --git a/src/control.cpp b/src/control.cpp -index e1838a6..880da68 100644 ---- a/src/control.cpp -+++ b/src/control.cpp -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #define TWO_BYTE_MAX 65535 - #define FOUR_CHAR 4 From d35ad68f984c89b1d2200a5d97a55ccf49130077 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Nov 2019 01:08:44 +0100 Subject: [PATCH 3/3] mmsd: init at unstable-2019-07-15 --- pkgs/tools/networking/mmsd/default.nix | 38 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/networking/mmsd/default.nix diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix new file mode 100644 index 000000000000..fee347dd2015 --- /dev/null +++ b/pkgs/tools/networking/mmsd/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchgit +, autoreconfHook +, pkgconfig +, glib +, dbus +}: + +stdenv.mkDerivation rec { + pname = "mmsd"; + version = "unstable-2019-07-15"; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; + rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; + sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + glib + dbus + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Multimedia Messaging Service Daemon"; + homepage = "https://01.org/ofono"; + license = licenses.gpl2; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5937fc95a78d..9cd0c72ee9ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19973,6 +19973,8 @@ in wxGTK30 = wxGTK30.override { withWebKit = true ; }; }; + mmsd = callPackage ../tools/networking/mmsd { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { };