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: a86d746b930e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b04040cce497
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 18, 2017

  1. gambit: 4.8.8-300db59 -> 4.8.8-415-g29ed48bb

    @fare
    fare committed Nov 18, 2017
    Copy the full SHA
    d75594e View commit details

Commits on Dec 5, 2017

  1. gerbil: 0.12-DEV-777-gd855915 -> 0.12-DEV-836-gcde6802

    @fare
    fare committed Dec 5, 2017
    Copy the full SHA
    6293517 View commit details

  2. Merge pull request #32329 from fare-patches/gerbil 

    Gerbil
    @7c6f434c
    7c6f434c authored Dec 5, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b04040c View commit details
Showing with 8 additions and 8 deletions.
  1. +3 −3 pkgs/development/compilers/gambit/default.nix
  2. +5 −5 pkgs/development/compilers/gerbil/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/compilers/gambit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "gambit-${version}";
version = "4.8.8-300db59";
version = "4.8.8-415-g29ed48bb";
bootstrap = import ./bootstrap.nix ( pkgs );

src = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "300db59e1d3b66bcd597f617849df0274d2a4472";
sha256 = "1mhy49lasakgvdaswkxasdssik11lx3hfx4h1gs2b6881488ssdp";
rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec";
sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr";
};

buildInputs = [ openssl git autoconf bootstrap ];
10 changes: 5 additions & 5 deletions pkgs/development/compilers/gerbil/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "gerbil-${version}";

version = "0.12-DEV-777-gd855915";
version = "0.12-DEV-836-gcde6802";
src = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
rev = "9db6187dc996eec4087f83b86339e7b17bb69bad";
sha256 = "1hqmsy77d62dvil3az4vdr0rmwvxhinjl1dbcxzamz2c2kcjv1jg";
rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5";
sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18";
};

buildInputs = [
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
export GERBIL_HOME=$out
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
if [[ \$# = 0 ]] ; then
${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
else
${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
fi
EOF
runHook postInstall