roswell: 21.01.14.108 -> 21.06.14.110

The core is now loaded from an image which is specific to the
derivation version and should not cause errors like `ore was built for runtime "-nixbld-2021-07-18-00-37-37" but this is "-nixbld-2021-07-24-18-10-15"`.

Update pkgs/development/tools/roswell/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

+36 -3
+25
pkgs/development/tools/roswell/0001-get-image-from-environment.patch
··· 1 + From 40c81f684ec2014ea63a712329f61c52aebe4dba Mon Sep 17 00:00:00 2001 2 + From: Valentin Boettcher <hiro@protagon.space> 3 + Date: Wed, 4 Aug 2021 17:25:12 +0200 4 + Subject: [PATCH] get image from environment 5 + 6 + --- 7 + src/cmd-run-sbcl.c | 2 +- 8 + 1 file changed, 1 insertion(+), 1 deletion(-) 9 + 10 + diff --git a/src/cmd-run-sbcl.c b/src/cmd-run-sbcl.c 11 + index a83b56c..dc472bb 100644 12 + --- a/src/cmd-run-sbcl.c 13 + +++ b/src/cmd-run-sbcl.c 14 + @@ -12,7 +12,7 @@ char** cmd_run_sbcl(int argc,char** argv,struct sub_command* cmd) { 15 + char* impl_path=impldir(arch,os,impl,version); 16 + char* help=get_opt("help",0); 17 + char* script=get_opt("script",0); 18 + - char* image=get_opt("image",0); 19 + + char* image=get_opt("image",1); 20 + char* program=get_opt("program",0); 21 + char* dynamic_space_size=get_opt("dynamic-space-size",1); 22 + char* control_stack_size=get_opt("control-stack-size",1); 23 + -- 24 + 2.32.0 25 +
+11 -3
pkgs/development/tools/roswell/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "roswell"; 5 - version = "21.01.14.108"; 5 + version = "21.06.14.110"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "roswell"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "1hj9q3ig7naky3pb3jkl9yjc9xkg0k7js3glxicv0aqffx9hkp3p"; 11 + sha256 = "18hxhz7skxvzabz5z0yjky4f3fsyfanafh0imkn5macp8aw3wsfm"; 12 12 }; 13 13 14 + patches = [ 15 + # Load the name of the image from the environment variable so that 16 + # it can be consistently overwritten. Using the command line 17 + # argument in the wrapper did not work. 18 + ./0001-get-image-from-environment.patch 19 + ]; 20 + 14 21 preConfigure = '' 15 22 sh bootstrap 16 23 ''; ··· 19 26 20 27 postInstall = '' 21 28 wrapProgram $out/bin/ros \ 22 - --add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system' \ 29 + --set image `basename $out` \ 30 + --add-flags 'lisp=sbcl-bin/system sbcl-bin.version=system -L sbcl-bin' \ 23 31 --prefix PATH : ${lib.makeBinPath [ sbcl ]} --argv0 ros 24 32 ''; 25 33