Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

inko: init at 0.15.0 & ivm: init at 0.5.0 #325089

Merged
merged 3 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6447,6 +6447,11 @@
githubId = 541748;
name = "Felipe Espinoza";
};
feathecutie = {
name = "feathecutie";
github = "feathecutie";
githubId = 53912746;
};
fedx-sudo = {
email = "[email protected]";
github = "FedX-sudo";
Expand Down
68 changes: 68 additions & 0 deletions pkgs/by-name/in/inko/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{ lib
, rustPlatform
, fetchFromGitHub
, llvm_16
, libffi
, libz
, libxml2
, ncurses
, stdenv
, makeWrapper
, callPackage
}:

rustPlatform.buildRustPackage rec {
pname = "inko";
version = "0.15.0";

src = fetchFromGitHub {
owner = "inko-lang";
repo = "inko";
rev = "v${version}";
hash = "sha256-Iojv8pTyILYpLFnoTlgUGmlfWWH0DgsGBRxzd3oRNwA=";
};

cargoHash = "sha256-PaZD7wwcami6EWvOHLislNkwQhCZItN9XZkPSExwo0U=";

buildInputs = [
libffi
libz
libxml2
ncurses
stdenv.cc.cc.lib
];

nativeBuildInputs = [
llvm_16
makeWrapper
];

env = {
INKO_STD = "${placeholder "out"}/lib";
INKO_RT = "${placeholder "out"}/lib/runtime";
};

postFixup = ''
wrapProgram $out/bin/inko \
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
'';

postInstall = ''
mkdir -p $out/lib/runtime
mv $out/lib/*.a $out/lib/runtime/
cp -r std/src/* $out/lib/
'';

passthru.tests = {
simple = callPackage ./test.nix { };
};

meta = {
description = "Language for building concurrent software with confidence";
homepage = "https://inko-lang.org/";
license = lib.licenses.mpl20;
maintainers = [ lib.maintainers.feathecutie ];
platforms = lib.platforms.unix;
mainProgram = "inko";
};
}
39 changes: 39 additions & 0 deletions pkgs/by-name/in/inko/test.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{ inko
, writeText
, runCommand
, ...
}:

let
source = writeText "hello.inko" /* inko */ ''
import std.process (sleep)
import std.stdio (STDOUT)
import std.time (Duration)

class async Printer {
fn async print(message: String, channel: Channel[Nil]) {
let _ = STDOUT.new.print(message)

channel.send(nil)
}
}

class async Main {
fn async main {
let channel = Channel.new(size: 2)

Printer().print('Hello', channel)
Printer().print('world', channel)

channel.receive
channel.receive
}
}
'';
in

runCommand "inko-test" { } ''
${inko}/bin/inko run ${source} > $out
cat $out | grep -q Hello
cat $out | grep -q world
''
54 changes: 54 additions & 0 deletions pkgs/by-name/iv/ivm/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{ lib
, rustPlatform
, fetchFromGitHub
, makeWrapper
, cargo
, llvm_16
, stdenv
, libffi
, libz
, libxml2
, ncurses
}:

rustPlatform.buildRustPackage rec {
pname = "ivm";
version = "0.5.0";

src = fetchFromGitHub {
owner = "inko-lang";
repo = "ivm";
rev = "v${version}";
hash = "sha256-z0oo1JUZbX3iT8N9+14NcqUzalpARImcbtUiQYS4djA=";
};

cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0=";

buildInputs = [
stdenv.cc.cc.lib
];

nativeBuildInputs = [
makeWrapper
];

postFixup = ''
wrapProgram $out/bin/ivm \
--prefix PATH : ${lib.makeBinPath [ cargo llvm_16.dev stdenv.cc ]} \
--prefix LIBRARY_PATH : ${lib.makeLibraryPath [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
--prefix LIBRARY_PATH : ${lib.makeLibraryPath [
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [

? Not sure

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LD_LIBRARY_PATH doesn't work here, but LIBRARY_PATH probably isn't the best option either.
Afaik, LD_LIBRARY_PATH specifies where to find libraries at runtime, but the libraries provided here are needed at build-time (not the build-time of ivm itself, but the time when ivm builds inko).
I dislike using LIBRARY_PATH here because it seems to be a gcc specific variable, but I don't know how else to achieve this, and at least this way ivm works the way it's supposed to (i.e. ivm install latest downloads and builds the latest inko version, compiled with all the right dependencies and libraries).

libffi
libz
libxml2
ncurses
]}
'';

meta = {
description = "Cross-platform Inko version manager";
homepage = "https://github.com/inko-lang/ivm";
license = lib.licenses.mpl20;
maintainers = [ lib.maintainers.feathecutie ];
platforms = lib.platforms.unix;
mainProgram = "ivm";
};
}