diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix deleted file mode 100644 index b01f62e9dea6..000000000000 --- a/pkgs/development/libraries/boost/1.55.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.55.0"; - - patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; - sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; - }; -}) diff --git a/pkgs/development/libraries/boost/clang-math-2.patch b/pkgs/development/libraries/boost/clang-math-2.patch deleted file mode 100644 index f819e9bec623..000000000000 --- a/pkgs/development/libraries/boost/clang-math-2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6bb71fdd8f7cc346d90fb14beb38b7297fc1ffd9 Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Sun, 26 Jan 2014 13:58:48 +0400 -Subject: [PATCH] Fixed incorrect initialization of 128-bit values, when no - native support for 128-bit integers is available. - ---- - boost/atomic/detail/cas128strong.hpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp -index 906c13e..dcb4d7d 100644 ---- a/boost/atomic/detail/cas128strong.hpp -+++ b/boost/atomic/detail/cas128strong.hpp -@@ -196,15 +196,17 @@ class base_atomic - - public: - BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) -- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) -+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT - { -+ memset(&v_, 0, sizeof(v_)); - memcpy(&v_, &v, sizeof(value_type)); - } - - void - store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type value_s = 0; -+ storage_type value_s; -+ memset(&value_s, 0, sizeof(value_s)); - memcpy(&value_s, &value, sizeof(value_type)); - platform_fence_before_store(order); - platform_store128(value_s, &v_); -@@ -247,7 +249,9 @@ class base_atomic - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - diff --git a/pkgs/development/libraries/boost/clang-math.patch b/pkgs/development/libraries/boost/clang-math.patch deleted file mode 100644 index aa3d76af28b2..000000000000 --- a/pkgs/development/libraries/boost/clang-math.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e4bde20f2eec0a51be14533871d2123bd2ab9cf3 Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Fri, 28 Feb 2014 12:43:11 +0400 -Subject: [PATCH] More compilation fixes for the case when 128-bit integers are - not supported. - ---- - boost/atomic/detail/gcc-atomic.hpp | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp -index a130590..4af99a1 100644 ---- a/boost/atomic/detail/gcc-atomic.hpp -+++ b/boost/atomic/detail/gcc-atomic.hpp -@@ -958,14 +958,16 @@ class base_atomic - - public: - BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) -- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) -+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT - { -+ memset(&v_, 0, sizeof(v_)); - memcpy(&v_, &v, sizeof(value_type)); - } - - void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type tmp = 0; -+ storage_type tmp; -+ memset(&tmp, 0, sizeof(tmp)); - memcpy(&tmp, &v, sizeof(value_type)); - __atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); - } -@@ -980,7 +982,8 @@ class base_atomic - - value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type tmp = 0; -+ storage_type tmp; -+ memset(&tmp, 0, sizeof(tmp)); - memcpy(&tmp, &v, sizeof(value_type)); - tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); - value_type res; -@@ -994,7 +997,9 @@ class base_atomic - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false, -@@ -1010,7 +1015,9 @@ class base_atomic - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true, diff --git a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch deleted file mode 100644 index f8163f6d2718..000000000000 --- a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam -index 273b28a..2d2031e 100644 ---- a/tools/build/v2/tools/python.jam -+++ b/tools/build/v2/tools/python.jam -@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? ) - - local rule darwin-installed-pythons ( version ? ) - { -- version ?= $(.version-countdown) ; -- -- local prefix -- = [ GLOB /System/Library/Frameworks /Library/Frameworks -- : Python.framework ] ; -- -- return $(prefix)/Versions/$(version)/bin/python ; -+ return ; - } - - -@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : - - # See if we can find a framework directory on darwin. - local framework-directory ; -- if $(target-os) = darwin -- { -- # Search upward for the framework directory. -- local framework-directory = $(libraries[-1]) ; -- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework -- { -- framework-directory = $(framework-directory:D) ; -- } -- -- if $(framework-directory:D=) = Python.framework -- { -- debug-message framework directory is \"$(framework-directory)\" ; -- } -- else -- { -- debug-message "no framework directory found; using library path" ; -- framework-directory = ; -- } -- } - - local dll-path = $(libraries) ; - diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index e9f7308e3464..ea73d2a10477 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -5,32 +5,17 @@ }: let - # for boost 1.55 we need to use 1.56's b2 - # since 1.55's build system is not working - # with our derivation - useBoost156 = rec { - version = "1.56.0"; - src = fetchurl { - url = "mirror://sourceforge/boost/boost_${lib.replaceStrings ["."] ["_"] version}.tar.bz2"; - sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk"; - }; - }; - makeBoost = file: lib.fix (self: callPackage file { boost-build = boost-build.override { # useBoost allows us passing in src and version from # the derivation we are building to get a matching b2 version. - useBoost = - if lib.versionAtLeast self.version "1.56" - then self - else useBoost156; # see above + useBoost = self; }; } ); in { - boost155 = makeBoost ./1.55.nix; boost159 = makeBoost ./1.59.nix; boost160 = makeBoost ./1.60.nix; boost165 = makeBoost ./1.65.nix; diff --git a/pkgs/development/libraries/boost/gcc-5.patch b/pkgs/development/libraries/boost/gcc-5.patch deleted file mode 100644 index 2b2713590ca7..000000000000 --- a/pkgs/development/libraries/boost/gcc-5.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/10125 - - boost/thread/pthread/once.hpp | 6 +++--- - boost/thread/pthread/once_atomic.hpp | 2 +- - boost/thread/win32/once.hpp | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/boost/thread/pthread/once.hpp b/boost/thread/pthread/once.hpp -index ccfb051..0bef038 100644 ---- a/boost/thread/pthread/once.hpp -+++ b/boost/thread/pthread/once.hpp -@@ -42,7 +42,7 @@ namespace boost - } - - #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11 --#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES -+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - template - inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args); - #else -@@ -65,7 +65,7 @@ namespace boost - private: - volatile thread_detail::uintmax_atomic_t epoch; - --#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES -+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - template - friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args); - #else -@@ -118,7 +118,7 @@ namespace boost - // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html - - --#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES -+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - - - template -diff --git a/boost/thread/pthread/once_atomic.hpp b/boost/thread/pthread/once_atomic.hpp -index 9e2f876..923f07b 100644 ---- a/boost/thread/pthread/once_atomic.hpp -+++ b/boost/thread/pthread/once_atomic.hpp -@@ -115,7 +115,7 @@ namespace boost - #endif - - --#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES -+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - - template - inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args) -diff --git a/boost/thread/win32/once.hpp b/boost/thread/win32/once.hpp -index cafcfd4..9b37b31 100644 ---- a/boost/thread/win32/once.hpp -+++ b/boost/thread/win32/once.hpp -@@ -227,7 +227,7 @@ namespace boost - } - } - --#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES -+#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - //#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) - inline void call_once(once_flag& flag, void (*f)()) - { diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b9bdec0cd077..d52c3cb560c0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -118,10 +118,7 @@ stdenv.mkDerivation { patchFlags = []; patches = patches - ++ optional stdenv.isDarwin ( - if version == "1.55.0" - then ./darwin-1.55-no-system-python.patch - else ./darwin-no-system-python.patch) + ++ optional stdenv.isDarwin ./darwin-no-system-python.patch # Fix boost-context segmentation faults on ppc64 due to ABI violation ++ optional (versionAtLeast version "1.61" && versionOlder version "1.71") (fetchpatch { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 167e178e3f3f..6e67d7bf67b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17466,7 +17466,6 @@ with pkgs; boolstuff = callPackage ../development/libraries/boolstuff { }; inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) - boost155 boost159 boost160 boost165 @@ -32986,7 +32985,7 @@ with pkgs; gl117 = callPackage ../games/gl-117 { }; globulation2 = callPackage ../games/globulation { - boost = boost155; + boost = boost168; # breaks with >= boost169 }; gltron = callPackage ../games/gltron { }; @@ -33462,7 +33461,7 @@ with pkgs; space-orbit = callPackage ../games/space-orbit { }; spring = callPackage ../games/spring - { stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; boost = boost155; }; + { stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; }; springLobby = callPackage ../games/spring/springlobby.nix { };