Unverified Commit d00dec7d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #247013 from wegank/guile-default-bump 

guile: default to guile_3_0
parents 8fa16970 21d348b2

pkgs/development/guile-modules/guile-commonmark/default.nix

+7 −5
Original line number Diff line number Diff line
@@ -4,22 +4,24 @@ 
, autoreconfHook

, guile

, pkg-config

, texinfo

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "guile-commonmark";

  version = "0.1.2";

  version = "unstable-2020-04-30";



  src = fetchFromGitHub {

    owner = "OrangeShark";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo=";

    repo = "guile-commonmark";

    rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468";

    hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI=";

  };



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

    texinfo # for makeinfo

  ];

  buildInputs = [

    guile

pkgs/development/guile-modules/guile-git/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 
  propagatedBuildInputs = [

    libgit2 scheme-bytestructures

  ];

  doCheck = true;

  doCheck = !stdenv.isDarwin;

  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];



  enableParallelBuilding = true;

pkgs/development/guile-modules/guile-lib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec { 


  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];



  doCheck = true;

  doCheck = !stdenv.isDarwin;



  preCheck = ''

    # Make `libgcc_s.so' visible for `pthread_cancel'.

pkgs/development/guile-modules/guile-ncurses/default.nix

+15 −14
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 


stdenv.mkDerivation rec {

  pname = "guile-ncurses";

  version = "1.7";

  version = "3.1";



  src = fetchurl {

    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";

    hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";

    hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM=";

  };



  nativeBuildInputs = [
@@ -25,20 +25,21 @@ stdenv.mkDerivation rec { 
    ncurses

  ];



  preConfigure = ''

    configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"

  '';

  configureFlags = [

    "--with-gnu-filesystem-hierarchy"

  ];



  postFixup = ''

  postFixup =

    let

      guileVersion = lib.versions.majorMinor guile.version;

    in

    ''

      for f in $out/share/guile/site/ncurses/**.scm; do \

        substituteInPlace $f \

        --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \

          --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \

      done

    '';



  # Undefined symbols for architecture arm64: "_u32_conv_from_encoding"

  env.NIX_LDFLAGS = "-lunistring";



  # XXX: 1 of 65 tests failed.

  doCheck = false;

pkgs/development/tools/misc/autogen/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:

{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }:



stdenv.mkDerivation rec {

  pname = "autogen";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec { 
    buildPackages.buildPackages.autogen buildPackages.texinfo

  ];

  buildInputs = [

    guile libxml2

    guile_2_2 libxml2

  ];



  preConfigure = ''