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

Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs

Browse Source 
Add mps 1.113.0, fix usage of Sleepycat license
This commit is contained in:
Shea Levy 2014-03-28 23:03:20 -04:00
commit 8a15cfdaec
5 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/licenses.nix
View File

@ -248,4 +248,10 @@
fullName = "Zope Public License 2.1"; fullName = "Zope Public License 2.1";
url = "http://old.zope.org/Resources/License/ZPL-2.1"; url = "http://old.zope.org/Resources/License/ZPL-2.1";
}; };
sleepycat = {
shortName = "Sleepycat";
fullName = "Sleepycat Public License";
url = "https://en.wikipedia.org/wiki/Sleepycat_License";
};
} }

2
pkgs/applications/ike/default.nix
View File

@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.iElectric ]; maintainers = [ maintainers.iElectric ];
license = "sleepycat"; license = licenses.sleepycat;
}; };
} }

4
pkgs/development/libraries/db/generic.nix
View File

@ -5,7 +5,7 @@
# Options from inherited versions # Options from inherited versions
, version, sha256 , version, sha256
, extraPatches ? [ ] , extraPatches ? [ ]
, license ? "Berkeley Database License" , license ? stdenv.lib.licenses.sleepycat
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
sha256 = sha256; sha256 = sha256;
}; };
patches = extraPatches; patches = extraPatches;
configureFlags = [ configureFlags = [

24
pkgs/development/libraries/mps/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, autoreconfHook, sqlite }:
stdenv.mkDerivation rec {
name = "mps-${version}";
version = "1.113.0";
src = fetchurl {
url = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz";
sha256 = "0v4difh3yl2mvpvnwlavhaags945l1452g07fllhdbpzgbjay79i";
};
buildInputs = [ autoreconfHook sqlite ];
# Fix a slightly annoying build failure in 'make install'
patchPhase = "substituteInPlace ./Makefile.in --replace /hot/Release /hot";
meta = {
description = "A flexible memory management and garbage collection library";
homepage = "http://www.ravenbrook.com/project/mps";
license = stdenv.lib.licenses.sleepycat;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -5313,6 +5313,8 @@ let
mlt = callPackage ../development/libraries/mlt { }; mlt = callPackage ../development/libraries/mlt { };
mps = callPackage ../development/libraries/mps { };
libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
mpeg2dec = libmpeg2; mpeg2dec = libmpeg2;