diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-04 18:15:59 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-04 18:15:59 +0200 |
| commit | f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d (patch) | |
| tree | e3b198b70d6d7c82c4cadba5c0a38366d7d4b938 /pkgs | |
| parent | 8419104ce96809c4bce7af58d5b8e0a653286df2 (diff) | |
| download | nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.tar nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.tar.gz nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.tar.bz2 nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.tar.lz nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.tar.xz nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.tar.zst nixlib-f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d.zip | |
libmatheval: unpin guile_2_0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libmatheval/default.nix | 39 | ||||
| -rw-r--r-- | 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 |