From 6c54bbc79aa78b57d4ec4e531b8fbb69d6f807d3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 24 Aug 2024 17:04:38 +0200 Subject: [PATCH 1/4] scs: move to pkgs/by-name --- .../science/math/scs/default.nix => by-name/sc/scs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/science/math/scs/default.nix => by-name/sc/scs/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/by-name/sc/scs/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/scs/default.nix rename to pkgs/by-name/sc/scs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff352964cc01..3f3741a71ad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37184,8 +37184,6 @@ with pkgs; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; - scs = callPackage ../development/libraries/science/math/scs { }; - sage = callPackage ../applications/science/math/sage { }; sageWithDoc = sage.override { withDoc = true; }; From b7345ea99ea4b0858b129cda331a3b54e8c0e09c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 24 Aug 2024 17:05:32 +0200 Subject: [PATCH 2/4] scs: format --- pkgs/by-name/sc/scs/package.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix index 087f4787a53b..9f4d835a4b2c 100644 --- a/pkgs/by-name/sc/scs/package.nix +++ b/pkgs/by-name/sc/scs/package.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: +{ + lib, + stdenv, + fetchFromGitHub, + blas, + lapack, + gfortran, + fixDarwinDylibNames, +}: assert (!blas.isILP64) && (!lapack.isILP64); @@ -22,7 +30,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ blas lapack gfortran.cc.lib ]; + buildInputs = [ + blas + lapack + gfortran.cc.lib + ]; doCheck = true; @@ -39,14 +51,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Splitting Conic Solver"; longDescription = '' Numerical optimization package for solving large-scale convex cone problems ''; homepage = "https://github.com/cvxgrp/scs"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.bhipple ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bhipple ]; }; } From b4c61eb26d6ca8bfd380aec726aacf4cebd65d1c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 24 Aug 2024 17:06:10 +0200 Subject: [PATCH 3/4] scs: 3.2.3 -> 3.2.7 Diff: https://github.com/cvxgrp/scs/compare/3.2.3...3.2.7 Changelog: https://github.com/cvxgrp/scs/releases/tag/3.2.7 --- pkgs/by-name/sc/scs/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scs/package.nix b/pkgs/by-name/sc/scs/package.nix index 9f4d835a4b2c..49911355e2db 100644 --- a/pkgs/by-name/sc/scs/package.nix +++ b/pkgs/by-name/sc/scs/package.nix @@ -6,19 +6,20 @@ lapack, gfortran, fixDarwinDylibNames, + nix-update-script, }: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.2.3"; + version = "3.2.7"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; - rev = version; - sha256 = "sha256-0g0r3DNgkPZgag0qtz79Wk3Cre1I2yaabFi3OgUzgfc="; + rev = "refs/tags/${version}"; + hash = "sha256-Y28LrYUuDaXPO8sce1pJIfG3A03rw7BumVgxCIKRn+U="; }; # Actually link and add libgfortran to the rpath @@ -51,12 +52,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Splitting Conic Solver"; longDescription = '' Numerical optimization package for solving large-scale convex cone problems ''; homepage = "https://github.com/cvxgrp/scs"; + changelog = "https://github.com/cvxgrp/scs/releases/tag/${version}"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bhipple ]; From 74685cd141b5d6607b93db8d70c425660d5c5499 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 24 Aug 2024 18:04:17 +0200 Subject: [PATCH 4/4] python312Packages.scs: 3.2.4 -> 3.2.7 Diff: https://github.com/bodono/scs-python/compare/refs/tags/3.2.4...3.2.7 --- pkgs/development/python-modules/scs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 9214204db210..8736930939e3 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "scs"; - version = "3.2.6"; + version = "3.2.7"; pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; rev = "refs/tags/${version}"; - hash = "sha256-Sl0+1/uEXAg+V2ijDFGmez6hBKQjbi63gN26lPCiEnI="; + hash = "sha256-ZhY4h0C8aF3IjD9NMtevcNTSqX+tIUao9bC+WlP+uDk="; fetchSubmodules = true; };