Chicken/apropos
SHA256
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Add missing import

Browse source
This commit is contained in:
Daniel Ziltener 2024-12-11 16:04:16 +01:00
parent 6475598a55
commit 939052f6e8
Signed by: zilti
GPG key ID: B38976E82C9DAE42
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apropos-api.scm
View file

@ -39,6 +39,7 @@
apropos apropos-list apropos-information-list) apropos apropos-list apropos-information-list)
(import scheme) (import scheme)
(import (scheme base))
(import (chicken base)) (import (chicken base))
(import (chicken fixnum)) (import (chicken fixnum))
(import (chicken foreign)) (import (chicken foreign))

2
apropos.egg
View file

@ -2,7 +2,7 @@
;;;; Kon Lovett, Jul '18 ;;;; Kon Lovett, Jul '18
((synopsis "CHICKEN apropos") ((synopsis "CHICKEN apropos")
(version "3.11.2") (version "3.11.3")
(category misc) (category misc)
(author "Kon Lovett") (author "Kon Lovett")
(license "BSD") (license "BSD")

3
apropos.release-info
View file

@ -1,4 +1,5 @@
;; -*- Scheme -*- ;; -*- Scheme -*-
(repo git "https://forgejo.lyrion.ch/Chicken/apropos") (repo git "https://forgejo.lyrion.ch/Chicken/apropos")
(uri targz "https://forgejo.lyrion.ch/Chicken/apropos/archive/{egg-release}.tar.gz") (uri targz "https://forgejo.lyrion.ch/Chicken/apropos/archive/{egg-release}.tar.gz")
(release "3.11.2") ;; Port to Chicken 6 (release "3.11.3") ;; Missing import
(release "3.11.2") ;; Port to Chicken 6

18
nix/chicken.nix
View file

@ -6,7 +6,7 @@
fetchurl, fetchurl,
makeWrapper, makeWrapper,
darwin, darwin,
tcc-mob, #tcc-mob,
version ? "git", version ? "git",
testers testers
}: }:
@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
srcs = [ srcs = [
(fetchgit { (fetchgit {
url = "git://code.call-cc.org/chicken-core"; url = "git://code.call-cc.org/chicken-core";
rev = "dbffda19e57c3be092e5a9174f1829632f5fa5a7"; rev = "bd76cc720650e04ca349c3699d517abcc0f2a847";
sha256 = "sha256-zWjf9JS4H1buBlkmUhIv+odCQzXaOPtI7VfIaQUhe6Q="; sha256 = "sha256-mY7o06sEQ9P6WvYLQWp60oCBbcojqLbDtyCgD/KEtqM=";
}) })
(fetchurl { (fetchurl {
url = "https://code.call-cc.org/dev-snapshots/2024/07/01/chicken-6.0.0-bootstrap.tar.gz"; url = "https://code.call-cc.org/dev-snapshots/2024/07/01/chicken-6.0.0-bootstrap.tar.gz";
@ -53,11 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
*) *)
mkcmd=make;; mkcmd=make;;
esac esac
export CC="${tcc-mob}/bin/tcc"
$mkcmd C_COMPILER=$CC PREFIX="$(pwd)"/../snapshot $mkcmd C_COMPILER=$CC PREFIX="$(pwd)"/../snapshot
$mkcmd C_COMPILER=$CC PREFIX="$(pwd)"/../snapshot install $mkcmd C_COMPILER=$CC PREFIX="$(pwd)"/../snapshot install
cd ../.. cd ../..
./configure --chicken "$(pwd)"/boot/snapshot/bin/chicken --c-compiler "${tcc-mob}/bin/tcc" ./configure --chicken "$(pwd)"/boot/snapshot/bin/chicken
$mkcmd boot-chicken $mkcmd boot-chicken
''; '';
@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ makeFlags = [
"PLATFORM=${platform}" "PLATFORM=${platform}"
"PREFIX=$(out)" "PREFIX=$(out)"
"C_COMPILER=${tcc-mob}/bin/tcc" #"C_COMPILER=${tcc-mob}/bin/tcc"
"CXX_COMPILER=$(CXX)" "CXX_COMPILER=$(CXX)"
] ++ (lib.optionals stdenv.isDarwin [ ] ++ (lib.optionals stdenv.isDarwin [
"XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
@ -81,20 +80,21 @@ stdenv.mkDerivation (finalAttrs: {
"POSTINSTALL_PROGRAM=install_name_tool" "POSTINSTALL_PROGRAM=install_name_tool"
]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"HOSTSYSTEM=${stdenv.hostPlatform.config}" "HOSTSYSTEM=${stdenv.hostPlatform.config}"
"TARGET_C_COMPILER=${tcc-mob}/bin/${stdenv.cc.targetPrefix}tcc" #"TARGET_C_COMPILER=${tcc-mob}/bin/${stdenv.cc.targetPrefix}tcc"
"TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c"
"TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" "TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
]); ]);
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
pkgs.hostname pkgs.hostname
tcc-mob #tcc-mob
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
darwin.autoSignDarwinBinariesHook darwin.autoSignDarwinBinariesHook
]; ];
configurePhase = '' configurePhase = ''
./configure --chicken ./chicken-boot --prefix $PREFIX --platform=$PLATFORM --c-compiler "${tcc-mob}/bin/tcc" ./configure --chicken ./chicken-boot --prefix $PREFIX --platform=$PLATFORM
''; '';
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;

3
shell.nix
View file

@ -1,14 +1,12 @@
with import <nixpkgs> { with import <nixpkgs> {
overlays = [ overlays = [
(final: prev: { (final: prev: {
tcc-mob = final.callPackage ./nix/tinycc.nix { stdenv = final.gcc13Stdenv; };
chicken = final.callPackage ./nix/chicken.nix { stdenv = final.gcc13Stdenv; }; chicken = final.callPackage ./nix/chicken.nix { stdenv = final.gcc13Stdenv; };
}) })
]; ];
}; };
mkShell { mkShell {
packages = with pkgs; [ packages = with pkgs; [
tcc-mob
chicken chicken
rlwrap rlwrap
] ]
@ -22,7 +20,6 @@ mkShell {
# ]) # ])
; ;
shellHook = '' shellHook = ''
export CC="${pkgs.tcc-mob}/bin/tcc"
export CHICKEN_PREFIX="$HOME/.chicken" export CHICKEN_PREFIX="$HOME/.chicken"
export CHICKEN_INSTALL_REPOSITORY="$HOME/.chicken/eggs" export CHICKEN_INSTALL_REPOSITORY="$HOME/.chicken/eggs"
export CHICKEN_REPOSITORY_PATH="${pkgs.chicken}/lib/chicken/12:$HOME/.chicken/eggs" export CHICKEN_REPOSITORY_PATH="${pkgs.chicken}/lib/chicken/12:$HOME/.chicken/eggs"