diff options
| author | Evan Hanson <evhan@foldling.org> | 2020-03-01 11:02:11 +1300 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-03-01 23:42:29 -0800 |
| commit | 4eb9e9a20c303f86129277e1fd48542fce4dad4f (patch) | |
| tree | 702530014549528e509bb407f3fc7367a80214d3 /pkgs/development/compilers | |
| parent | 83015ff7954a1a111737359ac644443327ce6f6f (diff) | |
| download | nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.tar nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.tar.gz nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.tar.bz2 nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.tar.lz nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.tar.xz nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.tar.zst nixpkgs-4eb9e9a20c303f86129277e1fd48542fce4dad4f.zip | |
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).
Diffstat (limited to 'pkgs/development/compilers')
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 3e47e413636..eefd8e35a27 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: let - version = "5.1.0"; + version = "5.2.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { 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; diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 8d4a62776d0..f5ed4b4b7f8 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation ({ for f in $out/bin/* do wrapProgram $f \ - --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_PATH" \ - --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share/" \ + --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \ + --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \ --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH" done diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix index a35b1f05891..3c4ae74c1e6 100644 --- a/pkgs/development/compilers/chicken/5/eggs.nix +++ b/pkgs/development/compilers/chicken/5/eggs.nix @@ -19,12 +19,12 @@ rec { }; matchable = eggDerivation { - name = "matchable-1.0"; + name = "matchable-1.1"; src = fetchegg { name = "matchable"; - version = "1.0"; - sha256 = "01vy2ppq3sq0wirvsvl3dh0bwa5jqs1i6rdjdd7pnwj4nncxd1ga"; + version = "1.1"; + sha256 = "084hm5dvbvgnpb32ispkp3hjili8z02hamln860r99jx68jx6j2v"; }; buildInputs = [ diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/development/compilers/chicken/5/setup-hook.sh index f5ebaaf638e..55324c05508 100644 --- a/pkgs/development/compilers/chicken/5/setup-hook.sh +++ b/pkgs/development/compilers/chicken/5/setup-hook.sh @@ -1,6 +1,6 @@ addChickenRepositoryPath() { - addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/" - addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/" + addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11" + addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share" } addEnvHooks "$targetOffset" addChickenRepositoryPath |