Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eeaca3104814
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1e043b6d1ec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 16, 2021

  1. ns-3: 3.32 -> 3.33

    @rgrunbla
    rgrunbla committed Jan 16, 2021
    Copy the full SHA
    71a9060 View commit details

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

    ns-3: 3.32 -> 3.33
    @teto
    teto authored Jan 16, 2021
    Copy the full SHA
    f1e043b View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 pkgs/development/libraries/science/networking/ns-3/default.nix
8 changes: 3 additions & 5 deletions pkgs/development/libraries/science/networking/ns-3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ let
in
stdenv.mkDerivation rec {
pname = "ns-3";
version = "32";
version = "33";

src = fetchFromGitLab {
owner = "nsnam";
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k";
};

nativeBuildInputs = [ wafHook ];
nativeBuildInputs = [ wafHook python ];

outputs = [ "out" ] ++ lib.optional pythonSupport "py";

@@ -60,8 +60,6 @@ stdenv.mkDerivation rec {

postPatch = ''
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; [
@@ -107,6 +105,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
description = "A discrete time event network simulator";
platforms = with platforms; unix;
maintainers = with maintainers; [ teto ];
maintainers = with maintainers; [ teto rgrunbla ];
};
}