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

Merge pull request #247137 from wegank/guile-platforms-3 

treewide: reduce guile_2_0 usage
parents cc4951bf c39c0479

pkgs/applications/audio/denemo/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config

, libjack2, gettext, intltool, guile_2_0, lilypond

, libjack2, gettext, intltool, guile_2_2, lilypond

, glib, libxml2, librsvg, libsndfile, aubio

, gtk3, gtksourceview, evince, fluidsynth, rubberband

, portaudio, portmidi, fftw, wrapGAppsHook }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 
  };



  buildInputs = [

    libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile

    libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile

    aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi

  ];

pkgs/applications/networking/instant-messengers/freetalk/default.nix

+12 −24
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchpatch

{ lib, stdenv, fetchurl

, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool

, libunwind, ncurses, curl, jansson, texinfo

, automake, autoconf }:

, argp-standalone }:

stdenv.mkDerivation rec {

  pname = "freetalk";

  version = "4.1";

  version = "4.2";



  src = fetchFromGitHub {

    owner = "GNUFreetalk";

    repo = "freetalk";

    rev = "v${version}";

    sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";

  src = fetchurl {

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

    hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA=";

  };



  patches = [

    # Pull pending patch for -fno-common tuulchain support:

    #   https://github.com/GNUFreetalk/freetalk/pull/39

    (fetchpatch {

      name = "fno-common.patch";

      url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch";

      sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf";

    })

  ];



  preConfigure = ''

    ./autogen.sh

  '';



  nativeBuildInputs = [ pkg-config texinfo autoconf automake ];

  nativeBuildInputs = [ pkg-config texinfo ];

  buildInputs = [

    guile glib loudmouth gmp libidn readline libtool

    libunwind ncurses curl jansson

  ] ++ lib.optionals stdenv.isDarwin [

    argp-standalone

  ];



  env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp";



  meta = with lib; {

    description =  "Console XMPP client";

    license = licenses.gpl3Plus ;

    maintainers = with maintainers; [ raskin ];

    platforms = platforms.linux;

    platforms = platforms.unix;

    downloadPage = "https://www.gnu.org/software/freetalk/";

  };

}

pkgs/applications/science/electronics/geda/default.nix

+8 −20
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }:

{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }:



stdenv.mkDerivation {

stdenv.mkDerivation rec {

  pname = "geda";

  version = "1.8.2-20130925";

  version = "1.10.2";



  src = fetchurl {

    url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz";

    sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";

    url = "http://ftp.geda-project.org/geda-gaf/stable/v${lib.versions.majorMinor version}/${version}/geda-gaf-${version}.tar.gz";

    hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ=";

  };



  patches = [

    # Pull upstream patch for -fno-common toolchains

    (fetchpatch {

      name = "fno-common-p1.patch";

      url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6";

      sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq";

    })

    (fetchpatch {

      name = "fno-common-p2.patch";

      url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158";

      sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k";

    })

  ];



  configureFlags = [

    "--disable-update-xdg-database"

    "--without-libfam"

  ];

  nativeBuildInputs = [ pkg-config ];



  nativeBuildInputs = [ groff pkg-config python2 ];

  buildInputs = [ guile gtk2 flex gawk perl ];



  meta = with lib; {

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

+9 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, guile

, pkg-config

, texinfo
@@ -8,16 +9,17 @@ 


stdenv.mkDerivation rec {

  pname = "guile-xcb";

  version = "1.3";

  version = "unstable-2017-05-29";



  src = fetchFromGitHub {

    owner = "mwitmer";

    repo = pname;

    rev = version;

    hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs=";

    rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3";

    hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs=";

  };



  nativeBuildInputs = [

    autoreconfHook

    pkg-config

  ];

  buildInputs = [
@@ -30,6 +32,10 @@ stdenv.mkDerivation rec { 
    "--with-guile-site-ccache-dir=$out/share/guile/site"

  ];



  makeFlags = [

    "GUILE_AUTO_COMPILE=0"

  ];



  meta = with lib; {

    homepage = "https://github.com/mwitmer/guile-xcb";

    description = "XCB bindings for Guile";

pkgs/development/libraries/libmatheval/default.nix

+23 −16
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }:

{ lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }:



let

  guileVersion = lib.versions.majorMinor guile.version;

in

stdenv.mkDerivation rec {

  version = "1.1.11";

  pname = "libmatheval";



  nativeBuildInputs = [ pkg-config autoconf flex ];

  nativeBuildInputs = [ pkg-config flex ];

  buildInputs = [ guile ];



  src = fetchurl {
@@ -14,20 +17,24 @@ stdenv.mkDerivation rec { 


  # Patches coming from debian package

  # https://packages.debian.org/source/sid/libs/libmatheval

  patches = [ (fetchpatch {

                url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch";

                sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62";

  patches = [

    (fetchpatch {

      url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/002-skip-docs.patch";

      hash = "sha256-wjz54FKQq7t9Bz0W3EOu+ZPTt8EcfkMotkZKwlWa09o=";

    })

    (fetchpatch {

                url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch";

                sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj";

      url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/003-guile3.0.patch";

      hash = "sha256-H3E/2m4MfQAbjpXbVFyNhikVifi3spVThzaVU5srmjI=";

    })

    (fetchpatch {

                url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch";

                sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm";

      url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/disable_coth_test.patch";

      hash = "sha256-9XeMXWDTzELWTPcsjAqOlIzp4qY9yupU+e6r0rJEUS0=";

    })

  ];



  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guileVersion}";

  env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guileVersion}";



  meta = {

    description = "A library to parse and evaluate symbolic expressions input as text";

    longDescription = ''
@@ -40,7 +47,7 @@ stdenv.mkDerivation rec { 
    homepage = "https://www.gnu.org/software/libmatheval/";

    license = lib.licenses.gpl3;

    maintainers = [ lib.maintainers.bzizou ];

    platforms = lib.platforms.linux;

    platforms = lib.platforms.unix;

  };

}