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

treewide: reduce guile_2_0 usage

pkgs/applications/audio/denemo/default.nix

···
 { 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 }:
···
   };
 
   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

···
-{ 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

···
-{ 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

···
 { lib
 , stdenv
 , fetchFromGitHub
+, autoreconfHook
 , guile
 , pkg-config
 , texinfo
···
 
 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 = [
···
   configureFlags = [
     "--with-guile-site-dir=$out/share/guile/site"
     "--with-guile-site-ccache-dir=$out/share/guile/site"
+  ];
+
+  makeFlags = [
+    "GUILE_AUTO_COMPILE=0"
   ];
 
   meta = with lib; {

pkgs/development/libraries/libmatheval/default.nix

···
-{ 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 {
···
 
   # 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";
-              } )
-              (fetchpatch {
-                url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch";
-                sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj";
-               } )
-              (fetchpatch {
-                url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch";
-                sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm";
-               } )
-            ];
+  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://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://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";
···
     homepage = "https://www.gnu.org/software/libmatheval/";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.bzizou ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }
 

pkgs/development/tools/guile/g-wrap/default.nix

···
 
   propagatedBuildInputs = [ libffi ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   doCheck = true;
 
   meta = with lib; {

pkgs/top-level/all-packages.nix

···
 
   freeipmi = callPackage ../tools/system/freeipmi { };
 
-  freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
-    guile = guile_2_0;
-  };
+  freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
 
   freetds = callPackage ../development/libraries/freetds { };
 
···
   guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
 
   guile-xcb = callPackage ../development/guile-modules/guile-xcb {
-    guile = guile_2_0;
+    guile = guile_2_2;
   };
 
   inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };
···
   };
 
   gwrap = callPackage ../development/tools/guile/g-wrap {
-    guile = guile_2_0;
+    guile = guile_2_2;
   };
 
   hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint;
···
 
   libmatchbox = callPackage ../development/libraries/libmatchbox { };
 
-  libmatheval = callPackage ../development/libraries/libmatheval {
-    autoconf = buildPackages.autoconf269;
-    guile = guile_2_0;
-  };
+  libmatheval = callPackage ../development/libraries/libmatheval { };
 
   libmatthew_java = callPackage ../development/libraries/java/libmatthew-java {
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
···
   fparser = callPackage ../applications/science/electronics/fparser { };
 
   geda = callPackage ../applications/science/electronics/geda {
-    guile = guile_2_0;
+    guile = guile_2_2;
   };
 
   gedit = callPackage ../applications/editors/gedit { };