diff options
| author | Armijn Hemel <armijn@tjaldur.nl> | 2017-04-23 22:15:31 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-04-25 15:08:36 +0300 |
| commit | b5530755a53eb4e22384d05f5b2fb7a0a9b1e584 (patch) | |
| tree | 55834c5a54518436a17ef23998160d46778d800e /pkgs | |
| parent | 45470c65f517eafaa93e528fb9ad35e707caa076 (diff) | |
| download | nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.tar nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.tar.gz nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.tar.bz2 nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.tar.lz nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.tar.xz nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.tar.zst nixlib-b5530755a53eb4e22384d05f5b2fb7a0a9b1e584.zip | |
bc: 1.06 -> 1.07.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/bc/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/bc/readlinefix.patch | 11 |
2 files changed, 4 insertions, 21 deletions
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 164bc3d55f05..2371e91ae2fc 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,21 +1,15 @@ -{stdenv, fetchurl, flex, readline}: +{stdenv, fetchurl, flex, readline, ed, texinfo}: stdenv.mkDerivation rec { - name = "bc-1.06"; + name = "bc-1.07.1"; src = fetchurl { url = "mirror://gnu/bc/${name}.tar.gz"; - sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"; + sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; }; - patches = [ ./readlinefix.patch ]; - - preConfigure = '' - sed -i 's/program.*save/static &/' bc/load.c - ''; - configureFlags = [ "--with-readline" ]; - buildInputs = [flex readline]; + buildInputs = [flex readline ed texinfo]; doCheck = true; diff --git a/pkgs/tools/misc/bc/readlinefix.patch b/pkgs/tools/misc/bc/readlinefix.patch deleted file mode 100644 index 74a66e90615d..000000000000 --- a/pkgs/tools/misc/bc/readlinefix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur bc-1.06.orig/bc/scan.l bc-1.06/bc/scan.l ---- bc-1.06.orig/bc/scan.l 2000-09-13 13:25:47.000000000 -0500 -+++ bc-1.06/bc/scan.l 2002-07-09 14:36:34.000000000 -0500 -@@ -143,7 +143,6 @@ - - /* Definitions for readline access. */ - extern FILE *rl_instream; --_PROTOTYPE(char *readline, (char *)); - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as |