nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109540 from rgrunbla/ns-3-3.33-update

Browse Source 
ns-3: 3.32 -> 3.33
This commit is contained in:
Matthieu Coudron 2021-01-16 17:15:16 +01:00 committed by GitHub
commit f1e043b6d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/science/networking/ns-3/default.nix
View File

@ -38,7 +38,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ns-3"; pname = "ns-3";
version = "32"; version = "33";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "nsnam"; owner = "nsnam";
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k"; sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k";
}; };
nativeBuildInputs = [ wafHook ]; nativeBuildInputs = [ wafHook python ];
outputs = [ "out" ] ++ lib.optional pythonSupport "py"; outputs = [ "out" ] ++ lib.optional pythonSupport "py";
@ -60,8 +60,6 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
patchShebangs doc/ns3_html_theme/get_version.sh patchShebangs doc/ns3_html_theme/get_version.sh
# FIX/Remove when https://github.com/NixOS/nixpkgs/pull/69310 gets merged
sed -i 's/program.ns3_module_dependencies.copy()/program.ns3_module_dependencies[:]/g' wscript
''; '';
wafConfigureFlags = with stdenv.lib; [ wafConfigureFlags = with stdenv.lib; [
@ -107,6 +105,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
description = "A discrete time event network simulator"; description = "A discrete time event network simulator";
platforms = with platforms; unix; platforms = with platforms; unix;
maintainers = with maintainers; [ teto ]; maintainers = with maintainers; [ teto rgrunbla ];
}; };
} }