From a9a0e6458b96ac21e03cb4e987cecbe7bffcd440 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 8 Jun 2020 21:04:44 +0200 Subject: [PATCH] asio: 1.12 -> 1.16 1.16 will now build on Darwin, properly mark it as such. Signed-off-by: Sirio Balmelli Co-authored-by: Dmitry Kalinkin --- pkgs/development/libraries/asio/1.12.nix | 6 ------ pkgs/development/libraries/asio/default.nix | 6 ++++++ pkgs/development/libraries/asio/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 pkgs/development/libraries/asio/1.12.nix create mode 100644 pkgs/development/libraries/asio/default.nix diff --git a/pkgs/development/libraries/asio/1.12.nix b/pkgs/development/libraries/asio/1.12.nix deleted file mode 100644 index 94fe4c70367..00000000000 --- a/pkgs/development/libraries/asio/1.12.nix +++ /dev/null @@ -1,6 +0,0 @@ -{callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.12.1"; - sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9"; -}) diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix new file mode 100644 index 00000000000..9c89b27d371 --- /dev/null +++ b/pkgs/development/libraries/asio/default.nix @@ -0,0 +1,6 @@ +{callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.16.1"; + sha256 = "1333ca6lnsdck4fsgjpbqf4lagxsnbg9970wxlsrinmwvdvdnwg2"; +}) diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index f1ea8a08418..d83a48e61b8 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin; # test when updating to >=1.12.1 + broken = stdenv.isDarwin && stdenv.lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018ef..8283f15c998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11285,9 +11285,8 @@ in assimp = callPackage ../development/libraries/assimp { }; - asio = asio_1_12; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio_1_12 = callPackage ../development/libraries/asio/1.12.nix { }; + asio = callPackage ../development/libraries/asio/default.nix { }; aspell = callPackage ../development/libraries/aspell { };