diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-07 21:55:45 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-06-11 16:02:21 +0200 |
| commit | c95f3a36cd2ab9c2565bfc9fd88eae57023146a5 (patch) | |
| tree | 808f3e1902bafe9fe3a8fe9a66278def750c183b | |
| parent | 4a90156912e9541cef15c556a4b4b366f02dea69 (diff) | |
| download | nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.tar nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.tar.gz nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.tar.bz2 nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.tar.lz nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.tar.xz nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.tar.zst nixlib-c95f3a36cd2ab9c2565bfc9fd88eae57023146a5.zip | |
sdcc: 3.5.0 -> 3.6.0
* requires texinfo * --std=c99 unneeded, fixed upstream * can build with nixpkgs default boost (v1.62), so let's do that
| -rw-r--r-- | pkgs/development/compilers/sdcc/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index a246a413f50d..7383f39f6cbb 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl, bison, flex, boost, gputils ? null }: +{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; name = "sdcc-${version}"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq"; + sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8"; }; # TODO: remove this comment when gputils != null is tested - buildInputs = [ bison flex boost gputils ]; + buildInputs = [ bison flex boost texinfo gputils ]; configureFlags = '' ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ''; - NIX_CFLAGS_COMPILE = "--std=c99"; # http://sourceforge.net/p/sdcc/code/9106/ - meta = with stdenv.lib; { description = "Small Device C Compiler"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 959f7f6ea038..9e3998bb152b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5808,7 +5808,7 @@ with pkgs; scalafmt = callPackage ../development/tools/scalafmt { }; - sdcc = callPackage ../development/compilers/sdcc { boost = boost159; }; + sdcc = callPackage ../development/compilers/sdcc { }; serpent = callPackage ../development/compilers/serpent { }; |