diff options
author | Sirio Balmelli <sirio@b-ad.ch> | 2020-06-08 21:04:44 +0200 |
---|---|---|
committer | Sirio Balmelli <sirio@b-ad.ch> | 2020-06-19 01:24:37 +0200 |
commit | a9a0e6458b96ac21e03cb4e987cecbe7bffcd440 (patch) | |
tree | 60e798f79ad4f0afb083853c6a6860ab18a4908d /pkgs/development | |
parent | d1037c682ecb4daca631a95c4054cdbfedd8ff13 (diff) |
asio: 1.12 -> 1.16
1.16 will now build on Darwin, properly mark it as such. Signed-off-by: Sirio Balmelli <sirio@b-ad.ch> Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/asio/1.12.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/asio/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/asio/generic.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/asio/1.12.nix b/pkgs/development/libraries/asio/1.12.nix deleted file mode 100644 index 94fe4c7036702..0000000000000 --- 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 0000000000000..9c89b27d371f5 --- /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 f1ea8a084187f..d83a48e61b8a1 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; }; } |