From b03bdc33ac233a8505f3f7a9b2e1a19911e9fcd8 Mon Sep 17 00:00:00 2001 From: Dejan Lukan Date: Sun, 11 Jun 2017 19:49:33 +0200 Subject: [PATCH 1/7] libvmi: init at 3e4114 --- pkgs/development/libraries/libvmi/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libvmi/default.nix diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix new file mode 100644 index 00000000000..42b7065a052 --- /dev/null +++ b/pkgs/development/libraries/libvmi/default.nix @@ -0,0 +1,31 @@ +{ stdenv, xen, which, autoreconfHook, fetchFromGitHub, yacc, bison, flex, glib, libtool, autoconf, automake, pkgconfig, libvirt }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "libvmi-${version}"; + version = "${stdenv.lib.strings.substring 0 7 rev}-2017-05-27"; + rev = "3e4114a64f012f1d3e2eb660bc65dcd130295d49"; + + src = fetchFromGitHub { + inherit rev; + owner = "libvmi"; + repo = "libvmi"; + sha256 = "0vbmrj0ij19i55afkqj64q7sgh0scpwk3c99qx6p6gn1qcy2wdss"; + }; + + buildInputs = [ glib xen which libvirt ]; + nativeBuildInputs = [ autoreconfHook yacc bison flex libtool autoconf automake pkgconfig ]; + + meta = with stdenv.lib; { + homepage = "http://libvmi.com/"; + description = "A C library for virtual machine introspection"; + longDescription = '' + LibVMI is a C library with Python bindings that makes it easy to monitor the low-level + details of a running virtual machine by viewing its memory, trapping on hardware events, + and accessing the vCPU registers. + ''; + license = [ licenses.gpl3 licenses.lgpg ]; + maintainers = with maintainers; [ eleanor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faa2d2db948..7b27e1cd1f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9103,6 +9103,8 @@ with pkgs; libvisual = callPackage ../development/libraries/libvisual { }; + libvmi = callPackage ../development/libraries/libvmi { }; + libvncserver = callPackage ../development/libraries/libvncserver {}; libviper = callPackage ../development/libraries/libviper { }; @@ -13355,7 +13357,7 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; cloud-print-connector = callPackage ../servers/cloud-print-connector { }; - + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { @@ -17791,7 +17793,7 @@ with pkgs; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; coqPackages = coqPackages_8_6; - + coq_8_4 = coqPackages_8_4.coq; coq_8_5 = coqPackages_8_5.coq; coq_8_6 = coqPackages_8_6.coq; From 80a2a584fef123d624f35d7782c12ceb05352784 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Wed, 27 Jun 2018 23:24:47 +0100 Subject: [PATCH 2/7] libvmi: -> 0.12 --- pkgs/development/libraries/libvmi/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 6891400fe76..2f1f7c31494 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -1,20 +1,33 @@ -{ stdenv, xen, which, autoreconfHook, fetchFromGitHub, yacc, bison, flex, glib, libtool, autoconf, automake, pkgconfig, libvirt }: +{ stdenv, + fetchFromGitHub, + which, + autoreconfHook, + autoconf, + automake, + libtool, + yacc, + bison, + flex, + glib, + pkgconfig, + json_c, + xen, + libvirt }: with stdenv.lib; stdenv.mkDerivation rec { name = "libvmi-${version}"; - version = "${stdenv.lib.strings.substring 0 7 rev}-2017-05-27"; - rev = "3e4114a64f012f1d3e2eb660bc65dcd130295d49"; + version = "0.12"; src = fetchFromGitHub { - inherit rev; owner = "libvmi"; repo = "libvmi"; - sha256 = "0vbmrj0ij19i55afkqj64q7sgh0scpwk3c99qx6p6gn1qcy2wdss"; + rev = "6934e8a4758018983ec53ec791dd14a7d6ac31a9"; + sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; }; - buildInputs = [ glib xen which libvirt ]; + buildInputs = [ glib which libvirt json_c xen ]; nativeBuildInputs = [ autoreconfHook yacc bison flex libtool autoconf automake pkgconfig ]; meta = with stdenv.lib; { From f8086e3e1e646dd875756b2ff9bc41514adc9db8 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Wed, 27 Jun 2018 23:25:44 +0100 Subject: [PATCH 3/7] libvmi: Add option to disable xen support --- pkgs/development/libraries/libvmi/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 2f1f7c31494..1a216f5f3b1 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -12,7 +12,8 @@ pkgconfig, json_c, xen, - libvirt }: + libvirt, + xenSupport ? true }: with stdenv.lib; @@ -27,9 +28,11 @@ stdenv.mkDerivation rec { sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; }; - buildInputs = [ glib which libvirt json_c xen ]; + buildInputs = [ glib which libvirt json_c ] ++ (optional xenSupport xen); nativeBuildInputs = [ autoreconfHook yacc bison flex libtool autoconf automake pkgconfig ]; + configureFlags = optional (!xenSupport) "--disable-xen"; + meta = with stdenv.lib; { homepage = "http://libvmi.com/"; description = "A C library for virtual machine introspection"; From 5505da90b0eab1360f60aa627dcb24d91b015d6d Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Wed, 27 Jun 2018 23:42:33 +0100 Subject: [PATCH 4/7] libvmi: Add gpl3 license in addition to lgpl3 --- pkgs/development/libraries/libvmi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 1a216f5f3b1..1eb3e1a15d6 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { details of a running virtual machine by viewing its memory, trapping on hardware events, and accessing the vCPU registers. ''; - license = [ licenses.lgpl3 ]; + license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ lschuermann ]; }; } From 5d3d84b74f1f9ac20da15aac1d33c399ab39027a Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 3 Jul 2018 18:14:04 +0100 Subject: [PATCH 5/7] libvmi: Use version tag as git revision --- pkgs/development/libraries/libvmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 1eb3e1a15d6..41b0f539d2b 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -19,12 +19,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libvmi-${version}"; - version = "0.12"; + version = "0.12.0"; src = fetchFromGitHub { owner = "libvmi"; repo = "libvmi"; - rev = "6934e8a4758018983ec53ec791dd14a7d6ac31a9"; + rev = "v${version}"; sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; }; From c5dff34ae1ddba5d7e5d39b673cc69f99cd04197 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 3 Jul 2018 18:17:51 +0100 Subject: [PATCH 6/7] libvmi: Add platforms metadata --- pkgs/development/libraries/libvmi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 41b0f539d2b..bbeb6cce48a 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { and accessing the vCPU registers. ''; license = with licenses; [ gpl3 lgpl3 ]; + platforms = platforms.linux; maintainers = with maintainers; [ lschuermann ]; }; } From e6d5e9564787c749379bebb7ca87c1779f460d9c Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Wed, 4 Jul 2018 09:14:57 +0100 Subject: [PATCH 7/7] libvmi: Remove unnecessary dependencies --- pkgs/development/libraries/libvmi/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index bbeb6cce48a..28cfe56d59b 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchFromGitHub, - which, autoreconfHook, - autoconf, - automake, - libtool, - yacc, bison, flex, glib, @@ -28,8 +23,8 @@ stdenv.mkDerivation rec { sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; }; - buildInputs = [ glib which libvirt json_c ] ++ (optional xenSupport xen); - nativeBuildInputs = [ autoreconfHook yacc bison flex libtool autoconf automake pkgconfig ]; + buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ]; configureFlags = optional (!xenSupport) "--disable-xen";