Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0379c1c8e9cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6059bf842aed
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 9, 2018

  1. python36Packages.cvxopt: 1.2.1 -> 1.2.2 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-cvxopt/versions
    @r-ryantm
    r-ryantm committed Nov 9, 2018
    Copy the full SHA
    2df88cb View commit details

Commits on Nov 12, 2018

  1. suitesparse: fixup darwin libraries 

    The build created libraries with an install_name that points to the
build directory instead of the installation prefix.  Causing errors like
this when other packages try to link against it's libraries.

    Library not loaded: /private/tmp/nix-build-suitesparse-5.3.0.drv-0/SuiteSparse/lib/libcholmod.3.0.12.dylib
    @LnL7
    LnL7 committed Nov 12, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5b8c4b0 View commit details

Commits on Nov 20, 2018

  1. pythonPackages.cvxopt: mark as broken on darwin 

    See #49994 (comment).
    @timokau
    timokau committed Nov 20, 2018
    Copy the full SHA
    5e3af12 View commit details

  2. Merge pull request #49994 from r-ryantm/auto-update/python3.6-cvxopt 

    python36Packages.cvxopt: 1.2.1 -> 1.2.2
    @timokau
    timokau authored Nov 20, 2018
    Copy the full SHA
    6059bf8 View commit details
Showing with 14 additions and 9 deletions.
  1. +6 −3 pkgs/development/libraries/science/math/suitesparse/default.nix
  2. +8 −6 pkgs/development/python-modules/cvxopt/default.nix
9 changes: 6 additions & 3 deletions pkgs/development/libraries/science/math/suitesparse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gfortran, openblas, cmake
{ stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames
, enableCuda ? false, cudatoolkit
}:

@@ -96,8 +96,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';

nativeBuildInputs = [ cmake ];
buildInputs = [ openblas gfortran.cc.lib ] ++ stdenv.lib.optionals enableCuda [cudatoolkit];
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

buildInputs = [ openblas gfortran.cc.lib ]
++ stdenv.lib.optional enableCuda cudatoolkit;

meta = with stdenv.lib; {
homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
14 changes: 8 additions & 6 deletions pkgs/development/python-modules/cvxopt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, isPyPy
@@ -15,13 +16,13 @@

buildPythonPackage rec {
pname = "cvxopt";
version = "1.2.1";
version = "1.2.2";

disabled = isPyPy; # hangs at [translation:info]

src = fetchPypi {
inherit pname version;
sha256 = "12e3cfda982576b0b9b597d297aaf3172efa765a20fbed6f3c066aa0c48ee817";
sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00";
};

# similar to Gsl, glpk, fftw there is also a dsdp interface
@@ -50,7 +51,7 @@ buildPythonPackage rec {
${python.interpreter} -m unittest discover -s tests
'';

meta = {
meta = with lib; {
homepage = http://cvxopt.org/;
description = "Python Software for Convex Optimization";
longDescription = ''
@@ -63,7 +64,8 @@ buildPythonPackage rec {
standard library and on the strengths of Python as a high-level
programming language.
'';
maintainers = with lib.maintainers; [ edwtjo ];
license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo ];
broken = stdenv.targetPlatform.isDarwin;
license = licenses.gpl3Plus;
};
}