From 5f1a99cdaa5113174815f73741ebb20496c92b7f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:37:24 +0200 Subject: [PATCH 1/2] scotch: move to pkgs/by-name --- .../math/scotch/default.nix => by-name/sc/scotch/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/math/scotch/default.nix => by-name/sc/scotch/package.nix} (100%) diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/by-name/sc/scotch/package.nix similarity index 100% rename from pkgs/applications/science/math/scotch/default.nix rename to pkgs/by-name/sc/scotch/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaba80f5715d..db156a5eee06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39056,8 +39056,6 @@ with pkgs; scilla = callPackage ../tools/security/scilla { }; - scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { }; msieve = callPackage ../applications/science/math/msieve { }; From 285278da9867f6dcb5ae6f3891b0ea22f8d166b7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:53:31 +0200 Subject: [PATCH 2/2] scotch: use fetchFromGitLab and format --- pkgs/by-name/sc/scotch/package.nix | 38 ++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 1eb057cfc7c5..7a93705cd914 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -1,24 +1,39 @@ -{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: +{ + lib, + stdenv, + fetchFromGitLab, + bison, + mpi, + flex, + zlib, +}: -stdenv.mkDerivation rec { - version = "6.1.1"; +stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - src_name = "scotch_${version}"; + version = "6.1.1"; - buildInputs = [ bison mpi flex zlib ]; + buildInputs = [ + bison + mpi + flex + zlib + ]; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "scotch"; + repo = "scotch"; + rev = "v${finalAttrs.version}"; + hash = "sha256-GUV6s+P56OAJq9AMe+LZOMPICQO/RuIi+hJAecmO5Wc="; }; - sourceRoot = "${src_name}/src"; - preConfigure = '' + cd src ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc ''; buildFlags = [ "scotch ptscotch" ]; + installFlags = [ "prefix=\${out}" ]; meta = { @@ -32,5 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; -} - +})