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: 810da65c70f8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a843ee96fe34
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 6, 2020

  1. mruby: 2.1.1 -> 2.1.2 

    (cherry picked from commit c743f4e)
    @marsam
    marsam authored and Jonathan Ringer committed Nov 6, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a843ee9 View commit details
Showing with 3 additions and 64 deletions.
  1. +0 −59 pkgs/development/compilers/mruby/bison-36-compat.patch
  2. +3 −5 pkgs/development/compilers/mruby/default.nix
59 changes: 0 additions & 59 deletions pkgs/development/compilers/mruby/bison-36-compat.patch
View file

This file was deleted.

8 changes: 3 additions & 5 deletions pkgs/development/compilers/mruby/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,26 +2,24 @@

stdenv.mkDerivation rec {
pname = "mruby";
version = "2.1.1";
version = "2.1.2";

src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU=";
sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3";
};

nativeBuildInputs = [ ruby bison rake ];

patches = [ ./bison-36-compat.patch ];

# Necessary so it uses `gcc` instead of `ld` for linking.
# https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25
preBuild = if stdenv.isLinux then "unset LD" else null;

installPhase = ''
mkdir $out
cp -R build/host/{bin,lib} $out
cp -R include build/host/{bin,lib} $out
'';

doCheck = true;