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

chicken: 5.1.0 -> 5.2.0 

Also updates the matchable egg (used by egg2nix) from 1.0 -> 1.1 and
removes trailing slashes from the path prefix variables passed to
wrapProgram (they're unnecessary and only result in doubled-up slashes
in the values).
This commit is contained in:
Evan Hanson 2020-03-01 11:02:11 +13:00 committed by Jon
parent 83015ff795
commit 4eb9e9a20c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
let let
version = "5.1.0"; version = "5.2.0";
platform = with stdenv; platform = with stdenv;
if isDarwin then "macosx" if isDarwin then "macosx"
else if isCygwin then "cygwin" else if isCygwin then "cygwin"
@ -18,7 +18,7 @@ stdenv.mkDerivation {
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";
sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw"; sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1";
}; };
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;

4
pkgs/development/compilers/chicken/5/eggDerivation.nix
View File

@ -31,8 +31,8 @@ stdenv.mkDerivation ({
for f in $out/bin/* for f in $out/bin/*
do do
wrapProgram $f \ wrapProgram $f \
--prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_PATH" \ --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \
--prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share/" \ --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \
--prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH" --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH"
done done

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

@ -19,12 +19,12 @@ rec {
}; };
matchable = eggDerivation { matchable = eggDerivation {
name = "matchable-1.0"; name = "matchable-1.1";
src = fetchegg { src = fetchegg {
name = "matchable"; name = "matchable";
version = "1.0"; version = "1.1";
sha256 = "01vy2ppq3sq0wirvsvl3dh0bwa5jqs1i6rdjdd7pnwj4nncxd1ga"; sha256 = "084hm5dvbvgnpb32ispkp3hjili8z02hamln860r99jx68jx6j2v";
}; };
buildInputs = [ buildInputs = [

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

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