From 023464f13fdab2cfe51ac8acdad116c670ba7151 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 24 Mar 2014 19:58:11 -0500 Subject: [PATCH 1/4] licenses: add Sleepycat Public License Signed-off-by: Austin Seipp --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index d82402cd3af9..603fddcb8577 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -248,4 +248,10 @@ fullName = "Zope Public License 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"; + }; } From 289a1c5f061afc26b569ef97b9a33aceccf16784 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 24 Mar 2014 19:58:36 -0500 Subject: [PATCH 2/4] ike: use stdenv.lib.licenses.sleepycat Signed-off-by: Austin Seipp --- pkgs/applications/ike/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index d595cb60da8c..1414310ebf33 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; maintainers = [ maintainers.iElectric ]; - license = "sleepycat"; + license = licenses.sleepycat; }; } From c7fd20ca5b853973dd4a9ea3fc85e52f5485da75 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 24 Mar 2014 20:01:24 -0500 Subject: [PATCH 3/4] db: Berkely DB (was) licensed under Sleepycat by default 6.0 and newer are still under AGPLv3 however. Signed-off-by: Austin Seipp --- pkgs/development/libraries/db/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index de9fb27b4ec2..6217bc461249 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -5,7 +5,7 @@ # Options from inherited versions , version, sha256 , extraPatches ? [ ] -, license ? "Berkeley Database License" +, license ? stdenv.lib.licenses.sleepycat }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; sha256 = sha256; }; - + patches = extraPatches; configureFlags = [ From 33e4adc32576517781c8ea9851d36988ce46546d Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 24 Mar 2014 20:32:39 -0500 Subject: [PATCH 4/4] mps: version 1.113.0 Signed-off-by: Austin Seipp --- pkgs/development/libraries/mps/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/mps/default.nix diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix new file mode 100644 index 000000000000..d01f5f84fec8 --- /dev/null +++ b/pkgs/development/libraries/mps/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e81a39ec083..9fdde18bee19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5304,6 +5304,8 @@ let mlt = callPackage ../development/libraries/mlt { }; + mps = callPackage ../development/libraries/mps { }; + libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; mpeg2dec = libmpeg2;