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: 22aff717dbe3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84d0ecfc5fdb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 17, 2021

  1. ns-3: Fix hash for 3.33 and patch for upstream bug

    @rgrunbla @teto
    rgrunbla authored and teto committed Jan 17, 2021
    Copy the full SHA
    84d0ecf View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/development/libraries/science/networking/ns-3/default.nix
11 changes: 10 additions & 1 deletion pkgs/development/libraries/science/networking/ns-3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitLab
, fetchpatch
, python
, wafHook

@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
owner = "nsnam";
repo = "ns-3-dev";
rev = "ns-3.${version}";
sha256 = "158yjhsrmslj1q4zcq5p16hv9i82qnxx714l7idicncn0wzrfx7k";
sha256 = "0ds8h0f2qcb0gc2a8bk38cbhdb122i4sbg589bjn59rblzw0hkq4";
};

nativeBuildInputs = [ wafHook python ];
@@ -97,6 +98,14 @@ stdenv.mkDerivation rec {
${pythonEnv.interpreter} ./test.py --nowaf
'';

patches = [
(fetchpatch {
name = "upstream-issue-336.patch";
url = "https://gitlab.com/nsnam/ns-3-dev/-/commit/673004edae1112e6cb249b698aad856d728530fb.patch";
sha256 = "0q96ividinbh9xlws014b2ir6gaavygnln5ca9m1db06m4vfwhng";
})
];

# strictoverflow prevents clang from discovering pyembed when bindings
hardeningDisable = [ "fortify" "strictoverflow"];