public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90098 from siriobalmelli-foss/fix/asio

Browse Source 
asio: 1.12 -> 1.16
This commit is contained in:
Dmitry Kalinkin 2020-06-19 14:47:31 -04:00 committed by GitHub
commit 96c4c0cc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/"; homepage = "http://asio.sourceforge.net/";
description = "Cross-platform C++ library for network and low-level I/O programming"; description = "Cross-platform C++ library for network and low-level I/O programming";
license = licenses.boost; 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; platforms = platforms.unix;
}; };
} }

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

@ -11291,9 +11291,8 @@ in
assimp = callPackage ../development/libraries/assimp { }; assimp = callPackage ../development/libraries/assimp { };
asio = asio_1_12;
asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; 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 { }; aspell = callPackage ../development/libraries/aspell { };