public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31538 from c0bw3b/pkg/libsmbios

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/licenses.nix
View File

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

38
pkgs/os-specific/linux/libsmbios/default.nix
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"; stdenv.mkDerivation rec {
in
stdenv.mkDerivation {
name = "libsmbios-${version}"; name = "libsmbios-${version}";
version = "2.3.3";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/dell/libsmbios/archive/v${version}.tar.gz"; owner = "dell";
sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j"; repo = "libsmbios";
rev = "v${version}";
sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ];
buildInputs = [ libxml2 perl doxygen ]; buildInputs = [ libxml2 ];
# It tries to install some Python stuff even when Python is disabled. configureFlags = [ "--disable-python" "--disable-graphviz" ];
installFlags = "pkgpythondir=$(TMPDIR)/python";
enableParallelBuilding = true;
postInstall = postInstall =
'' ''
mkdir -p $out/include mkdir -p $out/include
cp -va "src/include/"* "$out/include/" cp -a src/include/smbios_c $out/include/
cp -va "out/public-include/"* "$out/include/" cp -a out/public-include/smbios_c $out/include/
''; '';
# Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs
preFixup = ''rm -rf "$(pwd)" '';
meta = { meta = {
homepage = http://linux.dell.com/libsmbios/main; homepage = https://github.com/dell/libsmbios;
description = "A library to obtain BIOS information"; 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" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };
} }

2
pkgs/servers/web-apps/restya-board/default.nix
View File

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