diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-27 00:10:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 00:10:43 +0000 |
| commit | 1016b5a6bacc16300dc3a03aad306a77bc890bfc (patch) | |
| tree | 9da3c6c479252e51b46f06c7e39e9079dc93826b /pkgs/development/compilers | |
| parent | 8f71a7f33524bf3cdb2bd4df0ab0cf7a29a3115e (diff) | |
| parent | 23e960d45b99c74e6341c53c6c1c5dc09148794b (diff) | |
| download | nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.tar nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.tar.gz nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.tar.bz2 nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.tar.lz nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.tar.xz nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.tar.zst nixpkgs-1016b5a6bacc16300dc3a03aad306a77bc890bfc.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/chicken/5/chicken.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/12/llvm/default.nix | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 9f2554b7343..eb2ec5cbe33 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let - version = "5.2.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -9,9 +8,9 @@ let else if isSunOS then "solaris" else "linux"; # Should be a sane default in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chicken"; - inherit version; + version = "5.2.0"; binaryVersion = 11; @@ -46,13 +45,17 @@ stdenv.mkDerivation { done ''; - # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion + doCheck = true; + postCheck = '' + ./csi -R chicken.pathname -R chicken.platform \ + -p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))" + ''; meta = { - homepage = "http://www.call-cc.org/"; + homepage = "https://call-cc.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ corngood ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; # Maybe other Unix + platforms = lib.platforms.unix; description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index d2365745b98..8413f0f5745 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -96,6 +96,7 @@ in stdenv.mkDerivation (rec { rm test/DebugInfo/X86/convert-debugloc.ll rm test/DebugInfo/X86/convert-inlined.ll rm test/DebugInfo/X86/convert-linked.ll + rm test/DebugInfo/X86/vla-multi.ll rm test/tools/dsymutil/X86/op-convert.test '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) |