diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2019-04-23 20:50:23 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-27 08:32:49 +0200 |
commit | 5c5b887f1e7195a0c10df709109d81668e3f90a7 (patch) | |
tree | 4e9bcf76802a335287886fab77a8db8d42a93022 /pkgs/development/libraries/nlopt | |
parent | fea64990911ed053111664d64beb72f6fa5b37a9 (diff) |
nlopt: 2.6.0 -> 2.6.1
Changelog: https://github.com/stevengj/nlopt/releases/tag/v2.6.1 Build is not broken anymore with Octave 4.x since https://github.com/stevengj/nlopt/pull/245
Diffstat (limited to 'pkgs/development/libraries/nlopt')
-rw-r--r-- | pkgs/development/libraries/nlopt/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index f65e9211ce688..e9b89e83907fa 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,12 +1,14 @@ -{ fetchurl, stdenv, octave ? null, cmake }: +{ stdenv, fetchFromGitHub, cmake, octave ? null }: stdenv.mkDerivation rec { - name = "nlopt-${version}"; - version = "2.6.0"; + pname = "nlopt"; + version = "2.6.1"; - src = fetchurl { - url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"; - sha256 = "1asiyilhmx8abshk0d2aia6ykgs4czhg22xcm9z15wgmyp6pfc51"; + src = fetchFromGitHub { + owner = "stevengj"; + repo = pname; + rev = "v${version}"; + sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9"; }; nativeBuildInputs = [ cmake ]; @@ -30,7 +32,6 @@ stdenv.mkDerivation rec { description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; - broken = (octave != null); # cannot cope with Octave 4.x }; } |