diff options
| author | Justin Bedő <cu@cua0.org> | 2023-02-07 02:07:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-07 02:07:00 +0000 |
| commit | d92d0a1e544742f1d8adcebfc78eaed83d6498b4 (patch) | |
| tree | 7d5d06682b9e201b0f2f944990c91ffd115226e2 /pkgs | |
| parent | fbc33d9aa7e06951edd87c7ceb0fea940f8fb095 (diff) | |
| parent | 67e898c12e0d70b19cd699cf87ef4890c0295bec (diff) | |
| download | nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.tar nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.tar.gz nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.tar.bz2 nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.tar.lz nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.tar.xz nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.tar.zst nixpkgs-d92d0a1e544742f1d8adcebfc78eaed83d6498b4.zip | |
Merge pull request #212537 from nviets/nanonext
nng: 1.5.2 -> 1.6.0-prerelease and to rPackages.nanonext dependencies
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/nng/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 7f0bd15aa54..d7b021e7c49 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.5.2"; + version = "1.6.0-prerelease"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "v${version}"; - sha256 = "sha256-qbjMLpPk5FxH710Mf8AIraY0mERbaxVVhTT94W0EV+k="; + rev = "539e559e65cd8f227c45e4b046ac41c0edcf6c32"; + sha256 = "sha256-86+f0um25Ywn78S2JrV54K7k3O6ots0q2dCco1aK0xM="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0c02f68fccf..1d61428960a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -361,6 +361,7 @@ let mvabund = [ pkgs.gsl ]; mwaved = [ pkgs.fftw.dev ]; mzR = with pkgs; [ zlib netcdf ]; + nanonext = with pkgs; [ mbedtls nng ]; ncdf4 = [ pkgs.netcdf ]; nloptr = with pkgs; [ nlopt pkg-config ]; n1qn1 = [ pkgs.gfortran ]; |