cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

asio: 1.12 -> 1.16

Browse source 
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>
This commit is contained in:
Sirio Balmelli 2020-06-08 21:04:44 +02:00
parent d1037c682e
commit a9a0e6458b
No known key found for this signature in database
GPG key ID: 0437A96EFE4C426E
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/asio/1.12.nix
View file

@ -1,6 +0,0 @@
{callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.12.1";
sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9";
})

6
pkgs/development/libraries/asio/default.nix Normal file
View file

@ -0,0 +1,6 @@
{callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.16.1";
sha256 = "1333ca6lnsdck4fsgjpbqf4lagxsnbg9970wxlsrinmwvdvdnwg2";
})

2
pkgs/development/libraries/asio/generic.nix
View file

@ -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;
};
}

3
pkgs/top-level/all-packages.nix
View file

@ -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 { };