Unverified Commit 55e89d57 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #247840 from MuKnIO/alpha 

Update Gambit, Gerbil, Glow
parents e74fa540 0afac455

pkgs/development/compilers/gambit/build.nix

+10 −3
Original line number Diff line number Diff line 
{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep,

  src, version, git-version, stampYmd ? 0, stampHms ? 0,

  gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }:

{ gccStdenv, lib, pkgs,

  git, openssl, autoconf, gcc, coreutils, gnused, gnugrep,

  makeStaticLibraries,

  src, version, git-version,

  stampYmd ? 0, stampHms ? 0,

  gambit-support,

  optimizationSetting ? "-O1",

  gambit-params ? pkgs.gambit-support.stable-params }:



# Note that according to a benchmark run by Marc Feeley on May 2018,

# clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling
@@ -45,6 +50,7 @@ gccStdenv.mkDerivation rec { 
    "--enable-shared"

    "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.

    "--enable-openssl"

    "--enable-dynamic-clib"

    #"--enable-default-compile-options='(compactness 9)'" # Make life easier on the JS backend

    "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}"

    # "--enable-rtlib-debug" # used by Geiser, but only on recent-enough gambit, and messes js runtime
@@ -62,6 +68,7 @@ gccStdenv.mkDerivation rec { 
    # "--enable-coverage"

    # "--enable-inline-jumps"

    # "--enable-char-size=1" # default is 4

    # "--enable-march=native" # Nope, makes it not work on machines older than the builder

  ] ++ gambit-params.extraOptions

    # Do not enable poll on darwin due to https://github.com/gambit/gambit/issues/498

    ++ lib.optional (!gccStdenv.isDarwin) "--enable-poll";

pkgs/development/compilers/gambit/gambit-support.nix

+3 −2
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ rec { 
        --replace "echo > stamp.h;" "(echo '#define ___STAMP_VERSION \"${git-version}\"'; echo '#define ___STAMP_YMD ${toString stampYmd}'; echo '#define ___STAMP_HMS ${toString stampHms}';) > stamp.h;";

    '';

    modules = true;

    extraOptions = [];

    #extraOptions = [];

    extraOptions = ["--enable-trust-c-tco" "CFLAGS=-foptimize-sibling-calls"];

  };



  unstable-params = stable-params // {

    stable = false;

    extraOptions = ["--enable-trust-c-tco"];

    extraOptions = ["--enable-trust-c-tco"]; # "CFLAGS=-foptimize-sibling-calls" not necessary in latest unstable

  };



  export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;";

pkgs/development/compilers/gambit/unstable.nix

+6 −6
Original line number Diff line number Diff line 
{ callPackage, fetchFromGitHub, gambit-support }:



callPackage ./build.nix {

  version = "unstable-2023-07-30";

  git-version = "4.9.5-3-ge059fffd";

  stampYmd = 20230730;

  stampHms = 151945;

  version = "unstable-2023-08-06";

  git-version = "4.9.5-5-gf1fbe9aa";

  stampYmd = 20230806;

  stampHms = 195822;

  src = fetchFromGitHub {

    owner = "gambit";

    repo = "gambit";

    rev = "e059fffdfbd91e27c350ff2ebd671adefadd5212";

    sha256 = "0q7hdfchl6lw53xawmmjvhyjdmqxjdsnzjqv9vpkl2qa4vyir5fs";

    rev = "f1fbe9aa0f461e89f2a91bc050c1373ee6d66482";

    sha256 = "0b0gd6cwj8zxwcqglpsnmanysiq4mvma2mrgdfr6qy99avhbhzxm";

  };

  gambit-params = gambit-support.unstable-params;

}

pkgs/development/compilers/gerbil/build.nix

+3 −3
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ stdenv.mkDerivation rec { 
  meta = {

    description = "Gerbil Scheme";

    homepage    = "https://github.com/vyzo/gerbil";

    license     = lib.licenses.lgpl21; # also asl20, like Gambit

    # NB regarding platforms: regularly tested on Linux, only occasionally on macOS.

    license     = lib.licenses.lgpl21Only; # dual, also asl20, like Gambit

    # NB regarding platforms: regularly tested on Linux and on macOS.

    # Please report success and/or failure to fare.

    platforms   = lib.platforms.unix;

    maintainers = with lib.maintainers; [ fare ];

pkgs/development/compilers/gerbil/default.nix

+2 −2
Original line number Diff line number Diff line 
{ callPackage, fetchFromGitHub }:



callPackage ./build.nix rec {

  version = "0.16";

  version = "0.17";

  git-version = version;

  src = fetchFromGitHub {

    owner = "vyzo";

    repo = "gerbil";

    rev = "v${version}";

    sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f";

    sha256 = "0xzi9mhrmzcajhlz5qcnz4yjlljvbkbm9426iifgjn47ac0965zw";

  };

}