From aba1df98ee3ce09d122c6632eadf5fbca402dc80 Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Wed, 30 Mar 2022 09:54:33 -0400 Subject: [PATCH 1/4] Add the released boost 1.78 --- pkgs/development/libraries/boost/1.78.nix | 14 ++++++++++++++ pkgs/development/libraries/boost/default.nix | 1 + 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.78.nix diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix new file mode 100644 index 0000000000000..c14aa9252046b --- /dev/null +++ b/pkgs/development/libraries/boost/1.78.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.78.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_77_0.html + sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index aeb0878a0d11f..60dbc00f67fcc 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -45,4 +45,5 @@ in { boost174 = makeBoost ./1.74.nix; boost175 = makeBoost ./1.75.nix; boost177 = makeBoost ./1.77.nix; + boost178 = makeBoost ./1.78.nix; } From 62d294c94dd685fa4b8d0f72fd7915e15b4dffca Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Wed, 30 Mar 2022 10:11:05 -0400 Subject: [PATCH 2/4] Mention the new boost in the top-level packages and move reference boost17x to point to boost178 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9084c175703d6..91680196660ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16376,11 +16376,12 @@ with pkgs; boost174 boost175 boost177 + boost178 ; boost15x = boost159; boost16x = boost169; - boost17x = boost177; + boost17x = boost178; boost = boost17x; boost_process = callPackage ../development/libraries/boost-process { }; From 50559f519a54a235e357f3e105245feb5fa152a5 Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Fri, 1 Apr 2022 12:26:24 -0400 Subject: [PATCH 3/4] Fix reference to 1.78 that was left over --- pkgs/development/libraries/boost/1.78.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix index c14aa9252046b..6b74c5fae1bbb 100644 --- a/pkgs/development/libraries/boost/1.78.nix +++ b/pkgs/development/libraries/boost/1.78.nix @@ -8,7 +8,7 @@ callPackage ./generic.nix (args // rec { "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" ]; - # SHA256 from http://www.boost.org/users/history/version_1_77_0.html + # SHA256 from http://www.boost.org/users/history/version_1_78_0.html sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"; }; }) From 7cfb8807125bbaccf3855ff8ad00c96a6660aa5d Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Fri, 1 Apr 2022 12:27:50 -0400 Subject: [PATCH 4/4] Add newline to match staging --- pkgs/development/libraries/boost/1.78.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix index 6b74c5fae1bbb..a7ec9b0e04e49 100644 --- a/pkgs/development/libraries/boost/1.78.nix +++ b/pkgs/development/libraries/boost/1.78.nix @@ -12,3 +12,4 @@ callPackage ./generic.nix (args // rec { sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"; }; }) +