summary refs log tree commit diff
path: root/lib/systems/parse.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-02-19 16:21:57 +0100
committersternenseemann <sternenseemann@systemli.org>2023-03-08 17:12:18 +0100
commit471b9cab41b218080f5e9f4abbc83eaaa60c6abf (patch)
treeb2cc6155bf8b3c5c3d4f07931c54b3dfffaf2fa7 /lib/systems/parse.nix
parentfaa92cd30b1079e76b99716aa92df7cc5c552dd6 (diff)
downloadnixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.tar
nixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.tar.gz
nixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.tar.bz2
nixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.tar.lz
nixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.tar.xz
nixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.tar.zst
nixpkgs-471b9cab41b218080f5e9f4abbc83eaaa60c6abf.zip
haskell.compiler.ghcHEAD: 9.7.20221224 -> 9.7.20230217
- Christmas is over!

- Upstream has changed the name of the target triplet used for the JS
  backend from js-unknown-ghcjs to javascript-unknown-ghcjs, since Cabal
  calls the architecture "javascript":
  https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c

  Since the triplet is made up anyways, i.e. autoconf does not support
  it and Rust uses different triplets for its emscripten backends, we'll
  just change it as well.

- Upstream fixed the problem with ar(1) being invoked incorrectly by stage0:
  https://gitlab.haskell.org/ghc/ghc/-/commit/e987e345c807035e4637ca3eae227ae501e16c42
Diffstat (limited to 'lib/systems/parse.nix')
-rw-r--r--lib/systems/parse.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 5987cf1b5d2..bd3366e140b 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -131,7 +131,7 @@ rec {
 
     or1k     = { bits = 32; significantByte = bigEndian; family = "or1k"; };
 
-    js       = { bits = 32; significantByte = littleEndian; family = "js"; };
+    javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; };
   };
 
   # GNU build systems assume that older NetBSD architectures are using a.out.