diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-19 18:06:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-19 18:06:51 +0000 |
| commit | b833efbcd7155c7760c9d08860cc08d08f4702a9 (patch) | |
| tree | ee51bc99062da7c395a849ab22e91e0c3f3cf19b /pkgs/development/compilers | |
| parent | 849559c55731e6fef6276efaa8ed463d266bde65 (diff) | |
| parent | cc2ead5d96c8099d945c8dd3da89e1ac6ed7ab8d (diff) | |
| download | nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.tar nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.tar.gz nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.tar.bz2 nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.tar.lz nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.tar.xz nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.tar.zst nixpkgs-b833efbcd7155c7760c9d08860cc08d08f4702a9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ccl/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/compilers/jasmin-compiler/default.nix | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 79e7d324ec9..761ae5ba019 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: +{ lib, stdenv, fetchurl, fetchpatch, runCommand, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { @@ -59,6 +59,21 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256; }; + patches = [ + # Pull upstream fiux for -fno-common toolchains: + # https://github.com/Clozure/ccl/pull/316 + (fetchpatch { + name = "fno-common-p1.patch"; + url = "https://github.com/Clozure/ccl/commit/185dc1a00e7492f8be98e5f93b561758423595f1.patch"; + sha256 = "0wqfds7346qdwdsxz3bl2p601ib94rdp9nknj7igj01q8lqfpajw"; + }) + (fetchpatch { + name = "fno-common-p2.patch"; + url = "https://github.com/Clozure/ccl/commit/997de91062d1f152d0c3b322a1e3694243e4a403.patch"; + sha256 = "10w6zw8wgalkdyya4m48lgca4p9wgcp1h44hy9wqr94dzlllq0f6"; + }) + ]; + buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index dbacda5c479..140de424519 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "21.0"; + version = "2022.04.0"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2"; + sha256 = "sha256:0yf3lp469m8jdpqmqq3sw3h8l3psrzdp134wp3l1q31j3akskn2s"; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; |