parent
af4e86ffbb
commit
a5b49f272f
@ -1,25 +0,0 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub, python27 }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "python";
|
||||
version = "1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = pname;
|
||||
rev = "b7c3b2c447a69fdb0a974ba149062e52182fda08";
|
||||
hash = "sha256-Wl4on0rf4zbNxmwmq/ZkNiPIFCZY+1BdokPQoba2EVI=";
|
||||
};
|
||||
postPatch = let pythonLib = "${python27}/lib/libpython2.7.so";
|
||||
in ''
|
||||
substituteInPlace src/python.nim \
|
||||
--replace 'items(LibNames)' "[\"${pythonLib}\"]" \
|
||||
--replace 'dynlib: dllname' 'dynlib: "${pythonLib}"'
|
||||
'';
|
||||
doCheck = true;
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
description = "Nim wrapper for the Python 2 programming language";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub, python, rocksdb, snappy, spryvm, stew
|
||||
{ lib, buildNimPackage, fetchFromGitHub, rocksdb, snappy, spryvm, stew
|
||||
, tempfile, ui }:
|
||||
|
||||
buildNimPackage rec {
|
||||
@ -10,8 +10,8 @@ buildNimPackage rec {
|
||||
rev = "098da7bb34a9113d5db5402fecfc76b1c3fa3b36";
|
||||
hash = "sha256-PfWBrG2Z16tLgcN8JYpHaNMysBbbYX812Lkgk0ItMwE=";
|
||||
};
|
||||
buildInputs = [ python rocksdb snappy spryvm stew tempfile ui ];
|
||||
patches = [ ./nil.patch ];
|
||||
buildInputs = [ rocksdb snappy spryvm stew tempfile ui ];
|
||||
patches = [ ./nil.patch ./python.patch ];
|
||||
doCheck = true;
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
|
43
pkgs/development/nim-packages/spry/python.patch
Normal file
43
pkgs/development/nim-packages/spry/python.patch
Normal file
@ -0,0 +1,43 @@
|
||||
diff --git a/src/ispry.nim b/src/ispry.nim
|
||||
index 23ad6c3..d2cfc89 100644
|
||||
--- a/src/ispry.nim
|
||||
+++ b/src/ispry.nim
|
||||
@@ -21,7 +21,7 @@ import spryvm/sprycore, spryvm/sprylib, spryvm/spryextend, spryvm/sprymath,
|
||||
spryvm/spryos, spryvm/spryio, spryvm/sprymemfile, spryvm/sprythread,
|
||||
spryvm/spryoo, spryvm/sprydebug, spryvm/sprycompress, spryvm/sprystring,
|
||||
spryvm/sprymodules, spryvm/spryreflect, spryvm/spryblock, spryvm/sprynet,
|
||||
- spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, spryvm/sprypython,
|
||||
+ spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite,
|
||||
spryvm/spryrocksdb
|
||||
|
||||
const Prompt = ">>> "
|
||||
@@ -63,7 +63,6 @@ proc main() =
|
||||
|
||||
spry.addMemfile()
|
||||
spry.addThread()
|
||||
- spry.addPython()
|
||||
spry.addDebug()
|
||||
spry.addCompress()
|
||||
spry.addReflect()
|
||||
diff --git a/src/spry.nim b/src/spry.nim
|
||||
index 670a280..cda9027 100644
|
||||
--- a/src/spry.nim
|
||||
+++ b/src/spry.nim
|
||||
@@ -14,8 +14,7 @@ import spryvm/sprycore, spryvm/sprylib, spryvm/spryextend, spryvm/sprymath,
|
||||
spryvm/spryos, spryvm/spryio, spryvm/sprymemfile, spryvm/sprythread,
|
||||
spryvm/spryoo, spryvm/sprydebug, spryvm/sprycompress, spryvm/sprystring,
|
||||
spryvm/sprymodules, spryvm/spryreflect, spryvm/spryui, spryvm/spryblock, spryvm/sprynet,
|
||||
- spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, spryvm/spryrocksdb,
|
||||
- spryvm/sprypython
|
||||
+ spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, spryvm/spryrocksdb
|
||||
|
||||
var spry = newInterpreter()
|
||||
|
||||
@@ -34,7 +33,6 @@ spry.addOO()
|
||||
|
||||
spry.addMemfile()
|
||||
spry.addThread()
|
||||
-spry.addPython()
|
||||
spry.addDebug()
|
||||
spry.addCompress()
|
||||
spry.addReflect()
|
@ -48,8 +48,6 @@ lib.makeScope newScope (self:
|
||||
|
||||
pixie = callPackage ../development/nim-packages/pixie { };
|
||||
|
||||
python = callPackage ../development/nim-packages/python { };
|
||||
|
||||
redis = callPackage ../development/nim-packages/redis { };
|
||||
|
||||
redpool = callPackage ../development/nim-packages/redpool { };
|
||||
|
Loading…
Reference in New Issue
Block a user