From db079ab7985e58b8dc87daf2f206952aaa0039c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Gr=C3=BCnblatt?= Date: Fri, 20 Aug 2021 11:17:41 +0200 Subject: [PATCH] ns-3: 3.33 -> 3.34 --- .../libraries/science/networking/ns-3/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 4a90f082dc08..1419a154d90e 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitLab -, fetchpatch , python , wafHook @@ -39,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "ns-3"; - version = "33"; + version = "34"; src = fetchFromGitLab { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - sha256 = "0ds8h0f2qcb0gc2a8bk38cbhdb122i4sbg589bjn59rblzw0hkq4"; + sha256 = "sha256-udP7U+pHnNUdo35d9sN1o+aR9ctw9fgU3UunCjisGUI="; }; nativeBuildInputs = [ wafHook python ]; @@ -98,14 +97,6 @@ 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"];