commit
ab8c2b2b2c
@ -0,0 +1,47 @@ |
||||
{ stdenv, fetchFromGitHub, cmake |
||||
, zlib, boost, openssl, python, ncurses, SystemConfiguration |
||||
}: |
||||
|
||||
let |
||||
version = "2.0.1"; |
||||
|
||||
# Make sure we override python, so the correct version is chosen |
||||
boostPython = boost.override { enablePython = true; inherit python; }; |
||||
|
||||
in stdenv.mkDerivation { |
||||
pname = "libtorrent-rasterbar"; |
||||
inherit version; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "arvidn"; |
||||
repo = "libtorrent"; |
||||
rev = "v${version}"; |
||||
sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c"; |
||||
fetchSubmodules = true; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ cmake ]; |
||||
|
||||
buildInputs = [ boostPython openssl zlib python ncurses ] |
||||
++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; |
||||
|
||||
postInstall = '' |
||||
moveToOutput "include" "$dev" |
||||
moveToOutput "lib/${python.libPrefix}" "$python" |
||||
''; |
||||
|
||||
outputs = [ "out" "dev" "python" ]; |
||||
|
||||
cmakeFlags = [ |
||||
"-Dpython-bindings=on" |
||||
]; |
||||
|
||||
meta = with stdenv.lib; { |
||||
homepage = "https://libtorrent.org/"; |
||||
description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; |
||||
license = licenses.bsd3; |
||||
maintainers = [ maintainers.phreedom ]; |
||||
broken = stdenv.isDarwin; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
@ -0,0 +1,31 @@ |
||||
{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, simpy, tkinter |
||||
# GUI-based visualization of the simulation is optional |
||||
, enableVisualization ? true }: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "wsnsimpy"; |
||||
version = "0.2.5"; |
||||
disabled = isPy27; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "1b7fdqwc2v9alfwf2fr0aqr8rf2pb5lpm4anpilmvrh2lhjar4i2"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ setuptools simpy ] |
||||
++ lib.optional enableVisualization tkinter; |
||||
|
||||
# No test cases are included, thus unittest tries to run the examples, which |
||||
# fail because no DISPLAYs are available. |
||||
doCheck = false; |
||||
|
||||
pythonImportsCheck = [ "wsnsimpy" ] |
||||
++ lib.optional enableVisualization "wsnsimpy.wsnsimpy_tk"; |
||||
|
||||
meta = with lib; { |
||||
description = "SimPy-based WSN Simulator"; |
||||
homepage = "https://pypi.org/project/wsnsimpy/"; |
||||
license = licenses.bsd2; |
||||
maintainers = with maintainers; [ dmrauh ]; |
||||
}; |
||||
} |
@ -1,26 +1,26 @@ |
||||
{ fetchFromGitHub, stdenv, cmake }: |
||||
|
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "scas"; |
||||
|
||||
version = "0.4.6"; |
||||
version = "0.5.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "KnightOS"; |
||||
repo = "scas"; |
||||
rev = version; |
||||
sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; |
||||
sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ cmake ]; |
||||
cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; |
||||
|
||||
hardeningDisable = [ "format" ]; |
||||
nativeBuildInputs = [ cmake ]; |
||||
|
||||
meta = with stdenv.lib; { |
||||
homepage = "https://knightos.org/"; |
||||
description = "Assembler and linker for the Z80"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ siraben ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
|
@ -1,67 +0,0 @@ |
||||
diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t
|
||||
index 8ee7ff02c..bd5551ab3 100755
|
||||
--- a/t/agent/snmp/live.t
|
||||
+++ b/t/agent/snmp/live.t
|
||||
@@ -11,7 +11,7 @@ use Test::More;
|
||||
use FusionInventory::Agent::XML::Response;
|
||||
use FusionInventory::Agent::SNMP::Live;
|
||||
|
||||
-plan tests => 12;
|
||||
+plan tests => 11;
|
||||
|
||||
my $snmp;
|
||||
throws_ok {
|
||||
@@ -52,15 +52,6 @@ throws_ok {
|
||||
} qr/^Unable to resolve the UDP\/IPv4 address "none"/,
|
||||
'instanciation: unresolvable host';
|
||||
|
||||
-throws_ok {
|
||||
- $snmp = FusionInventory::Agent::SNMP::Live->new(
|
||||
- version => 1,
|
||||
- community => 'public',
|
||||
- hostname => '1.1.1.1'
|
||||
- );
|
||||
-} qr/no response from host 1.1.1.1/,
|
||||
-'instanciation: unresponding host';
|
||||
-
|
||||
SKIP: {
|
||||
skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP};
|
||||
|
||||
diff --git a/t/apps/agent.t b/t/apps/agent.t
|
||||
index c0f6fc52f..c83837d70 100755
|
||||
--- a/t/apps/agent.t
|
||||
+++ b/t/apps/agent.t
|
||||
@@ -12,7 +12,7 @@ use XML::TreePP;
|
||||
use FusionInventory::Agent::Tools;
|
||||
use FusionInventory::Test::Utils;
|
||||
|
||||
-plan tests => 34;
|
||||
+plan tests => 33;
|
||||
|
||||
my ($content, $out, $err, $rc);
|
||||
|
||||
@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub {
|
||||
check_content_ok($out);
|
||||
};
|
||||
|
||||
-ok(
|
||||
- exists $content->{REQUEST}->{CONTENT}->{SOFTWARES},
|
||||
- 'inventory has software'
|
||||
-);
|
||||
-
|
||||
ok(
|
||||
exists $content->{REQUEST}->{CONTENT}->{ENVS},
|
||||
'inventory has environment variables'
|
||||
diff --git a/t/tasks/inventory/linux/softwares.t b/t/tasks/inventory/linux/softwares.t
|
||||
index 72a0e578c..13944f34f 100755
|
||||
--- a/t/tasks/inventory/linux/softwares.t
|
||||
+++ b/t/tasks/inventory/linux/softwares.t
|
||||
@@ -89,7 +89,7 @@ my $rpm_packages = [
|
||||
PUBLISHER => 'Mageia.Org',
|
||||
NAME => 'xfsprogs',
|
||||
COMMENTS => 'Utilities for managing the XFS filesystem',
|
||||
- INSTALLDATE => '25/03/2012',
|
||||
+ INSTALLDATE => '24/03/2012',
|
||||
FILESIZE => '3628382',
|
||||
FROM => 'rpm',
|
||||
ARCH => 'x86_64',
|
Loading…
Reference in new issue