Merge pull request #31538 from c0bw3b/pkg/libsmbios

libsmbios: 2.3.2 -> 2.3.3
This commit is contained in:
Renaud 2017-11-26 18:19:14 +01:00 committed by GitHub
commit 819d089772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 21 deletions

View File

@ -15,7 +15,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
afl21 = spdx {
spdxId = "AFL-2.1";
fullName = "Academic Free License";
fullName = "Academic Free License v2.1";
};
afl3 = spdx {
spdxId = "AFL-3.0";
fullName = "Academic Free License v3.0";
};
agpl3 = spdx {
@ -426,6 +431,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Notion modified LGPL";
};
nposl3 = spdx {
spdxId = "NPOSL-3.0";
fullName = "Non-Profit Open Software License 3.0";
};
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
@ -441,7 +451,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "OpenSSL License";
};
osl = spdx {
osl21 = spdx {
spdxId = "OSL-2.1";
fullName = "Open Software License 2.1";
};
osl3 = spdx {
spdxId = "OSL-3.0";
fullName = "Open Software License 3.0";
};

View File

@ -1,36 +1,38 @@
{ stdenv, fetchurl, pkgconfig, libxml2, perl, autoreconfHook, doxygen }:
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libtool, gettext
, libxml2, perl, doxygen }:
let
version = "2.3.2";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "libsmbios-${version}";
version = "2.3.3";
src = fetchurl {
url = "https://github.com/dell/libsmbios/archive/v${version}.tar.gz";
sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j";
src = fetchFromGitHub {
owner = "dell";
repo = "libsmbios";
rev = "v${version}";
sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxml2 perl doxygen ];
nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ];
buildInputs = [ libxml2 ];
# It tries to install some Python stuff even when Python is disabled.
installFlags = "pkgpythondir=$(TMPDIR)/python";
configureFlags = [ "--disable-python" "--disable-graphviz" ];
enableParallelBuilding = true;
postInstall =
''
mkdir -p $out/include
cp -va "src/include/"* "$out/include/"
cp -va "out/public-include/"* "$out/include/"
cp -a src/include/smbios_c $out/include/
cp -a out/public-include/smbios_c $out/include/
'';
# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" '';
preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs
meta = {
homepage = http://linux.dell.com/libsmbios/main;
homepage = https://github.com/dell/libsmbios;
description = "A library to obtain BIOS information";
license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
license = with stdenv.lib.licenses; [ osl21 gpl2Plus ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Web-based kanban board";
license = licenses.osl;
license = licenses.osl3;
homepage = http://restya.com;
maintainers = with maintainers; [ tstrobel ];
platforms = platforms.linux;