diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/asio | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/asio')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/asio/1.12.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/asio/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/asio/generic.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/asio/1.12.nix b/nixpkgs/pkgs/development/libraries/asio/1.12.nix deleted file mode 100644 index 94fe4c703670..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/development/libraries/asio/default.nix b/nixpkgs/pkgs/development/libraries/asio/default.nix new file mode 100644 index 000000000000..9c89b27d371f --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/asio/generic.nix b/nixpkgs/pkgs/development/libraries/asio/generic.nix index f1ea8a084187..d83a48e61b8a 100644 --- a/nixpkgs/pkgs/development/libraries/asio/generic.nix +++ b/nixpkgs/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; }; } |