Merge pull request from vale981/update_ros

roswell: 21.01.14.108 -> 21.06.14.110
This commit is contained in:
Sandro 2021-08-05 15:30:39 +02:00 committed by GitHub
commit 5bc69ff8ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 3 deletions

View file

@ -0,0 +1,25 @@
From 40c81f684ec2014ea63a712329f61c52aebe4dba Mon Sep 17 00:00:00 2001
From: Valentin Boettcher <hiro@protagon.space>
Date: Wed, 4 Aug 2021 17:25:12 +0200
Subject: [PATCH] get image from environment
---
src/cmd-run-sbcl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cmd-run-sbcl.c b/src/cmd-run-sbcl.c
index a83b56c..dc472bb 100644
--- a/src/cmd-run-sbcl.c
+++ b/src/cmd-run-sbcl.c
@@ -12,7 +12,7 @@ char** cmd_run_sbcl(int argc,char** argv,struct sub_command* cmd) {
char* impl_path=impldir(arch,os,impl,version);
char* help=get_opt("help",0);
char* script=get_opt("script",0);
- char* image=get_opt("image",0);
+ char* image=get_opt("image",1);
char* program=get_opt("program",0);
char* dynamic_space_size=get_opt("dynamic-space-size",1);
char* control_stack_size=get_opt("control-stack-size",1);
--
2.32.0

View file

@ -2,15 +2,22 @@
stdenv.mkDerivation rec {
pname = "roswell";
version = "21.01.14.108";
version = "21.06.14.110";
src = fetchFromGitHub {
owner = "roswell";
repo = pname;
rev = "v${version}";
sha256 = "1hj9q3ig7naky3pb3jkl9yjc9xkg0k7js3glxicv0aqffx9hkp3p";
sha256 = "18hxhz7skxvzabz5z0yjky4f3fsyfanafh0imkn5macp8aw3wsfm";
};
patches = [
# Load the name of the image from the environment variable so that
# it can be consistently overwritten. Using the command line
# argument in the wrapper did not work.
./0001-get-image-from-environment.patch
];
preConfigure = ''
sh bootstrap
'';
@ -19,7 +26,8 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/ros \
--add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system' \
--set image `basename $out` \
--add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system -L sbcl-bin' \
--prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros
'';