Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

archimedes: use latest toolchain, not gcc-6

Without the change archimedes fails to build with latest toolchains as:

ld: archimedes.c:(.text+0xdac7): undefined reference to `rnd'
ld: archimedes.c:(.text+0xdeab): undefined reference to `rnd'
ld: archimedes.c:(.text+0xdf13): undefined reference to `rnd'
ld: archimedes.c:(.text+0xe3ef): undefined reference to `rnd'
ld: archimedes.o:archimedes.c:(.text+0xe456): more undefined references to `rnd' follow
ld: archimedes.o: in function `EMC':
archimedes.c:(.text+0xf11b): undefined reference to `creation'
ld: archimedes.c:(.text+0xf5f5): undefined reference to `creation'
ld: archimedes.c:(.text+0xf826): undefined reference to `creation'
ld: archimedes.c:(.text+0xf9ce): undefined reference to `creation'

The change happens to fix build against clang as well.

+12 -4
+11 -1
pkgs/applications/science/electronics/archimedes/default.nix
··· 1 - { lib, stdenv, fetchurl }: 2 3 stdenv.mkDerivation rec { 4 pname = "archimedes"; ··· 8 url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz"; 9 sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; 10 }; 11 12 meta = { 13 description = "GNU package for semiconductor device simulations";
··· 1 + { lib, stdenv, fetchurl, fetchpatch }: 2 3 stdenv.mkDerivation rec { 4 pname = "archimedes"; ··· 8 url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz"; 9 sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; 10 }; 11 + 12 + patches = [ 13 + # Pull patch pending upstream inclusion to support c99 toolchains: 14 + # https://savannah.gnu.org/bugs/index.php?62703 15 + (fetchpatch { 16 + name = "c99.patch"; 17 + url = "https://savannah.gnu.org/bugs/download.php?file_id=53393"; 18 + sha256 = "1xmy1w4ln1gynldk3srdi2h0fxpx465dsa1yxc3rzrrjpxh6087f"; 19 + }) 20 + ]; 21 22 meta = { 23 description = "GNU package for semiconductor device simulations";
+1 -3
pkgs/top-level/all-packages.nix
··· 33156 33157 astral = callPackage ../applications/science/biology/astral { }; 33158 33159 - archimedes = callPackage ../applications/science/electronics/archimedes { 33160 - stdenv = gcc6Stdenv; 33161 - }; 33162 33163 bayescan = callPackage ../applications/science/biology/bayescan { }; 33164
··· 33156 33157 astral = callPackage ../applications/science/biology/astral { }; 33158 33159 + archimedes = callPackage ../applications/science/electronics/archimedes { }; 33160 33161 bayescan = callPackage ../applications/science/biology/bayescan { }; 33162