From e17f117a71b44fa272a75b6a3d77873b9b40ce80 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:29:26 +0200 Subject: [PATCH 1/6] denemo: pin guile_2_2 instead --- pkgs/applications/audio/denemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 7e27bf783705..80018ecc395b 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,5 +1,5 @@ { 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 ]; From 37f3ebe498315da84c50cfa6f5e64df46a9d0b87 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:30:09 +0200 Subject: [PATCH 2/6] freetalk: 4.1 -> 4.2 --- .../instant-messengers/freetalk/default.nix | 36 +++++++------------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ffe82e6708aa..fdfbbc5b275b 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,43 +1,31 @@ -{ 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/"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885b0d85b5a7..373b7c21fcff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8113,9 +8113,7 @@ with pkgs; 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 { }; From 37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:44:22 +0200 Subject: [PATCH 3/6] guile-xcb: 1.3 -> unstable-2017-05-29 --- pkgs/development/guile-modules/guile-xcb/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d009901bbf2e..19a790db77a4 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,6 +1,7 @@ { 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 373b7c21fcff..e6c37f1715c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18069,7 +18069,7 @@ with pkgs; 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 { }; From 8419104ce96809c4bce7af58d5b8e0a653286df2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:47:42 +0200 Subject: [PATCH 4/6] gwrap: pin guile_2_2 instead --- pkgs/development/tools/guile/g-wrap/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 6bb80306e68e..516076012423 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libffi ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + doCheck = true; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6c37f1715c2..61a7bbbc4f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19180,7 +19180,7 @@ with pkgs; }; gwrap = callPackage ../development/tools/guile/g-wrap { - guile = guile_2_0; + guile = guile_2_2; }; hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; From f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 18:15:59 +0200 Subject: [PATCH 5/6] libmatheval: unpin guile_2_0 --- .../libraries/libmatheval/default.nix | 39 +++++++++++-------- pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index b0fe1c35ef3a..fcf4167c1901 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,13 @@ -{ 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,19 +17,23 @@ 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"; - } ) - (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"; @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61a7bbbc4f4d..09c7cdfba277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22920,10 +22920,7 @@ with pkgs; 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 From c39c0479dd5f26660750af9bd4c22256aca7db0a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:10:54 +0200 Subject: [PATCH 6/6] geda: 1.8.2-20130925 -> 1.10.2 --- .../science/electronics/geda/default.nix | 28 ++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 6b77f75b11bb..775bae981339 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,32 +1,20 @@ -{ 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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09c7cdfba277..b9a742a25a1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39317,7 +39317,7 @@ with pkgs; 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 { };