Merge pull request #327006 from Sigmanificient/bsc

bsc: add sigmanificient to maintainers, 3.1.0 -> 3.3.4, migrate to by-name, modernize
This commit is contained in:
Peder Bergebakken Sundt 2024-07-28 21:59:08 +02:00 committed by GitHub
commit 817b5bc3c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 38 deletions

View File

@ -0,0 +1,36 @@
{
lib,
stdenv,
fetchFromGitHub,
llvmPackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bsc";
version = "3.3.4";
src = fetchFromGitHub {
owner = "IlyaGrebnov";
repo = "libbsc";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q=";
};
enableParallelBuilding = true;
buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp;
makeFlags = [
"CC=$(CXX)"
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
description = "High performance block-sorting data compression library";
homepage = "http://libbsc.com/";
maintainers = with maintainers; [ sigmanificient ];
license = lib.licenses.asl20;
platforms = platforms.unix;
mainProgram = "bsc";
};
})

View File

@ -1,34 +0,0 @@
{ lib, stdenv, fetchFromGitHub, openmp }:
stdenv.mkDerivation rec {
pname = "bsc";
version = "3.1.0";
src = fetchFromGitHub {
owner = "IlyaGrebnov";
repo = "libbsc";
rev = version;
sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz";
};
enableParallelBuilding = true;
buildInputs = lib.optional stdenv.isDarwin openmp;
postPatch = ''
substituteInPlace makefile \
--replace 'g++' '$(CXX)'
'';
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "High performance block-sorting data compression library";
homepage = "http://libbsc.com/";
maintainers = with maintainers; [ ];
# Later commits changed the licence to Apache2 (no release yet, though)
license = with licenses; [ lgpl3Plus ];
platforms = platforms.unix;
mainProgram = "bsc";
};
}

View File

@ -6413,10 +6413,6 @@ with pkgs;
boltbrowser = callPackage ../tools/misc/boltbrowser { };
bsc = callPackage ../tools/compression/bsc {
inherit (llvmPackages) openmp;
};
bzip2 = callPackage ../tools/compression/bzip2 { };
bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };