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: fcd46443dffe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b466774e948
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 31, 2020

  1. Copy the full SHA
    c13bf84 View commit details
  2. Merge pull request #78896 from drewrisinger/dr-pr-lib-scs

    lib.science.math.scs: 2.0.2 -> 2.1.1
    mmahut authored Jan 31, 2020
    Copy the full SHA
    7b46677 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/libraries/science/math/scs/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/libraries/science/math/scs/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "scs";
version = "2.0.2";
version = "2.1.1";

src = fetchFromGitHub {
owner = "cvxgrp";
repo = "scs";
rev = "v${version}";
sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
rev = version;
sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20";
};

# Actually link and add libgfortran to the rpath
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
longDescription = ''
Numerical optimization package for solving large-scale convex cone problems
'';
homepage = https://github.com/cvxgrp/scs;
homepage = "https://github.com/cvxgrp/scs";
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.bhipple ];