public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66245 from corngood/chicken-fix

Browse Source 
chicken: fixes for chicken 5.1.0
This commit is contained in:
Joachim F 2019-08-15 04:09:49 +00:00 committed by GitHub
commit e8c04bb367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/chicken/5/chicken.nix
View File

@ -13,7 +13,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "chicken-${version}"; name = "chicken-${version}";
binaryVersion = 9; binaryVersion = 11;
src = fetchurl { src = fetchurl {
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
@ -22,8 +22,8 @@ stdenv.mkDerivation {
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; buildFlags = "PLATFORM=${platform} PREFIX=$(out)";
installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; installFlags = "PLATFORM=${platform} PREFIX=$(out)";
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
@ -37,10 +37,6 @@ stdenv.mkDerivation {
wrapProgram $f \ wrapProgram $f \
--prefix PATH : ${stdenv.cc}/bin --prefix PATH : ${stdenv.cc}/bin
done done
mv $out/var/lib/chicken $out/lib
rmdir $out/var/lib
rmdir $out/var
''; '';
# TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion

20
pkgs/development/compilers/chicken/5/eggs.nix
View File

@ -1,4 +1,4 @@
{ pkgs }: { pkgs, stdenv }:
rec { rec {
inherit (pkgs) eggDerivation fetchegg; inherit (pkgs) eggDerivation fetchegg;
@ -33,12 +33,12 @@ rec {
}; };
srfi-1 = eggDerivation { srfi-1 = eggDerivation {
name = "srfi-1-0.5"; name = "srfi-1-0.5.1";
src = fetchegg { src = fetchegg {
name = "srfi-1"; name = "srfi-1";
version = "0.5"; version = "0.5.1";
sha256 = "0gh1h406xbxwm5gvc5znc93nxp9xjbhyqf7zzga08k5y6igxrlvk"; sha256 = "15x0ajdkw5gb3vgs8flzh5g0pzl3wmcpf11iimlm67mw6fxc8p7j";
}; };
buildInputs = [ buildInputs = [
@ -47,12 +47,12 @@ rec {
}; };
srfi-13 = eggDerivation { srfi-13 = eggDerivation {
name = "srfi-13-0.2"; name = "srfi-13-0.2.1";
src = fetchegg { src = fetchegg {
name = "srfi-13"; name = "srfi-13";
version = "0.2"; version = "0.2.1";
sha256 = "0jazbdnn9bjm7wwxqq7xzqxc9zfvaapq565rf1czj6ayl96yvk3n"; sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq";
}; };
buildInputs = [ buildInputs = [
@ -61,12 +61,12 @@ rec {
}; };
srfi-14 = eggDerivation { srfi-14 = eggDerivation {
name = "srfi-14-0.2"; name = "srfi-14-0.2.1";
src = fetchegg { src = fetchegg {
name = "srfi-14"; name = "srfi-14";
version = "0.2"; version = "0.2.1";
sha256 = "13nm4nn1d52nkvhjizy26z3s6q41x1ml4zm847xzf86x1zwvymni"; sha256 = "0gc33cx4xll9vsf7fm8jvn3gc0604kn3bbi6jfn6xscqp86kqb9p";
}; };
buildInputs = [ buildInputs = [

2
pkgs/development/compilers/chicken/5/setup-hook.sh
View File

@ -1,5 +1,5 @@
addChickenRepositoryPath() { addChickenRepositoryPath() {
addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/9/" addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/"
addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/" addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/"
} }