uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,23 @@
{ lib, buildNimPackage, fetchFromGitHub, rocksdb, snappy, spryvm, stew
, tempfile, ui }:
buildNimPackage rec {
pname = "spry";
version = "0.9.0";
src = fetchFromGitHub {
owner = "gokr";
repo = pname;
rev = "098da7bb34a9113d5db5402fecfc76b1c3fa3b36";
hash = "sha256-PfWBrG2Z16tLgcN8JYpHaNMysBbbYX812Lkgk0ItMwE=";
};
buildInputs = [ rocksdb snappy spryvm stew tempfile ui ];
patches = [ ./nil.patch ./python.patch ];
doCheck = true;
meta = with lib;
src.meta // {
description =
"A Smalltalk and Rebol inspired language implemented as an AST interpreter in Nim";
license = [ licenses.mit ];
maintainers = [ maintainers.ehmry ];
};
}

View file

@ -0,0 +1,35 @@
diff --git a/src/ispry.nim b/src/ispry.nim
index 23ad6c3..dc38a9d 100644
--- a/src/ispry.nim
+++ b/src/ispry.nim
@@ -134,8 +134,8 @@ proc main() =
#discard spry.setBinding(newEvalWord("@"), result)
var output = $result
# Print any result
- if output.isNil:
- output = if suspended: "nil" else: ""
+ if output == "" and suspended:
+ output = "nil"
stdout.write(output & "\n")
# except:
# echo "Oops, sorry about that: " & getCurrentExceptionMsg() & "\n"
diff --git a/src/spry.nim b/src/spry.nim
index 670a280..d81bb4c 100644
--- a/src/spry.nim
+++ b/src/spry.nim
@@ -87,13 +87,13 @@ for kind, key, val in getopt():
of cmdEnd: assert(false) # cannot happen
if eval:
- if filename == nil:
+ if filename == "":
writeHelp()
else:
code = filename
else:
code =
- if filename == nil:
+ if filename == "":
# no filename has been given, so we use stdin
readAll stdin
else:

View 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()