Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b22ec9ca5ec9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 916aa568a220
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 19, 2020

  1. j: 807 -> 901 

    Upgrade j to 901.
Uses the newer build scripts in the make2 directory in the jsource repo.
    @AshyIsMe
    AshyIsMe committed Apr 19, 2020
    Copy the full SHA
    0c454c4 View commit details

Commits on Apr 20, 2020

  1. Merge pull request #85547 from AshyIsMe/j901 

    j: 807 -> 901
    @7c6f434c
    7c6f434c authored Apr 20, 2020
    Copy the full SHA
    916aa56 View commit details
Showing with 10 additions and 33 deletions.
  1. +10 −33 pkgs/development/interpreters/j/default.nix
43 changes: 10 additions & 33 deletions pkgs/development/interpreters/j/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,14 @@

stdenv.mkDerivation rec {
pname = "j";
version = "807";
jtype = "release";
version = "901";
jtype = "release-e";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
rev = "j${version}-${jtype}";
sha256 = "1qciw2yg9x996zglvj2461qby038x89xcmfb3qyrh3myn8m1nq2n";
sha256 = "13ky37rrl6mc66fckrdnrw64gmvq1qlv6skzd513lab4d0wigshw";
name = "jsource";
};

buildInputs = [ readline libedit bc ];
@@ -26,57 +27,33 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR
export JLIB=$SOURCE_DIR/jlibrary
export jbld=$HOME/bld
export jplatform=${platform}
export jmake=$SOURCE_DIR/make
export jgit=$SOURCE_DIR
export JBIN=$jbld/j${bits}/bin
mkdir -p $JBIN
echo $OUT_DIR
cd make
cd make2
patchShebangs .
sed -i jvars.sh -e "
s@~/git/jsource@$SOURCE_DIR@;
s@~/jbld@$HOME@;
"
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
# For future versions, watch
# https://github.com/jsoftware/jsource/pull/4
cp ./jvars.sh $HOME
./build_all.sh
echo '
#define jversion "${version}"
#define jplatform "${platform}"
#define jtype "${jtype}" // release,beta,...
#define jlicense "GPL3"
#define jbuilder "nixpkgs" // website or email
' > ../jsrc/jversion.h
./build_jconsole.sh j${bits}
./build_libj.sh j${bits}
cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin"
'';

checkPhase = ''
echo 'i. 5' | $JBIN/jconsole | fgrep "0 1 2 3 4"
echo 'i. 5' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4"
# Now run the real tests
cd $SOURCE_DIR/test
for f in *.ijs
do
echo $f
$JBIN/jconsole < $f > /dev/null || echo FAIL && echo PASS
$JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS
done
'';

installPhase = ''
mkdir -p "$out"
cp -r $JBIN "$out/bin"
rm $out/bin/*.txt # Remove logs from the bin folder
mkdir -p "$out/share/j"
cp -r $JLIB/{addons,system} "$out/share/j"