diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/development/gnuradio-modules | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/gnuradio-modules')
| -rw-r--r-- | nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix b/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix index 5ff4ffd75653..638210f8412f 100644 --- a/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix +++ b/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix @@ -8,18 +8,22 @@ , cppunit , log4cpp , osmosdr +, gmp +, mpir +, fftwFloat +, icu }: mkDerivation rec { pname = "gr-ais"; - version = "2015-12-20"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - rev = "cdc1f52745853f9c739c718251830eb69704b26e"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + rev = "2162103226f3dae43c8c2ab23b79483b84346665"; + sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b"; }; - disabledForGRafter = "3.8"; + disabledForGRafter = "3.9"; nativeBuildInputs = [ cmake @@ -32,6 +36,10 @@ mkDerivation rec { osmosdr boost log4cpp + gmp + mpir + fftwFloat + icu ]; meta = with lib; { |