mininet: 2.3.0d6 -> 2.3.0

This commit is contained in:
Matthieu Coudron 2021-05-22 01:31:34 +02:00 committed by Matthieu Coudron
parent 71e04f8372
commit fb79f910b7
3 changed files with 11 additions and 11 deletions

View file

@ -1,15 +1,15 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, which , which
, python , python3
, help2man , help2man
}: }:
let let
pyEnv = python.withPackages(ps: [ ps.setuptools ]); pyEnv = python3.withPackages(ps: [ ps.setuptools ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mininet"; pname = "mininet";
version = "2.3.0d6"; version = "2.3.0";
outputs = [ "out" "py" ]; outputs = [ "out" "py" ];
@ -17,14 +17,16 @@ stdenv.mkDerivation rec {
owner = "mininet"; owner = "mininet";
repo = "mininet"; repo = "mininet";
rev = version; rev = version;
sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x"; sha256 = "sha256-bCppmeB+zQMKTptnzhsXtl72XJXU3USo7cQgP1Z6SrY=";
}; };
buildFlags = [ "mnexec" ]; buildFlags = [ "mnexec" ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
pythonPath = [ python.pkgs.setuptools ]; pythonPath = [ python3.pkgs.setuptools ];
buildInputs = [ python which help2man ]; nativeBuildInputs = [ help2man ];
propagatedBuildInputs = [ python3 which ];
installTargets = [ "install-mnexec" "install-manpages" ]; installTargets = [ "install-mnexec" "install-manpages" ];
@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Emulator for rapid prototyping of Software Defined Networks"; description = "Emulator for rapid prototyping of Software Defined Networks";
license = { license = {
fullName = "Mininet 2.3.0d6 License"; fullName = "Mininet 2.3.0 License";
}; };
platforms = platforms.linux; platforms = platforms.linux;
homepage = "https://github.com/mininet/mininet"; homepage = "https://github.com/mininet/mininet";

View file

@ -31354,9 +31354,7 @@ with pkgs;
scotch = callPackage ../applications/science/math/scotch { }; scotch = callPackage ../applications/science/math/scotch { };
mininet = callPackage ../tools/virtualization/mininet { mininet = callPackage ../tools/virtualization/mininet { };
python = python3;
};
msieve = callPackage ../applications/science/math/msieve { }; msieve = callPackage ../applications/science/math/msieve { };

View file

@ -4656,7 +4656,7 @@ in {
minimock = callPackage ../development/python-modules/minimock { }; minimock = callPackage ../development/python-modules/minimock { };
mininet-python = (toPythonModule (pkgs.mininet.override { mininet-python = (toPythonModule (pkgs.mininet.override {
inherit python; python3 = python;
})).py; })).py;
minio = callPackage ../development/python-modules/minio { }; minio = callPackage ../development/python-modules/minio { };