Unverified Commit 755c177f authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

Merge pull request #219027 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage; haskellPackages.ghc: 9.2.6 -> 9.2.7
parents 96fb326f 4fa82b9e

doc/languages-frameworks/haskell.section.md

+14 −10
Original line number Diff line number Diff line
@@ -71,8 +71,10 @@ $ nix-env -f '<nixpkgs>' -qaP -A haskell.compiler 
haskell.compiler.ghc810                  ghc-8.10.7

haskell.compiler.ghc88                   ghc-8.8.4

haskell.compiler.ghc90                   ghc-9.0.2

haskell.compiler.ghc92                   ghc-9.2.4

haskell.compiler.ghc924                  ghc-9.2.4

haskell.compiler.ghc925                  ghc-9.2.5

haskell.compiler.ghc926                  ghc-9.2.6

haskell.compiler.ghc92                   ghc-9.2.7

haskell.compiler.ghc942                  ghc-9.4.2

haskell.compiler.ghc943                  ghc-9.4.3

haskell.compiler.ghc94                   ghc-9.4.4
@@ -86,13 +88,15 @@ haskell.compiler.ghc924Binary ghc-binary-9.2.4 
haskell.compiler.ghc924BinaryMinimal     ghc-binary-9.2.4

haskell.compiler.integer-simple.ghc810   ghc-integer-simple-8.10.7

haskell.compiler.integer-simple.ghc8107  ghc-integer-simple-8.10.7

haskell.compiler.integer-simple.ghc884   ghc-integer-simple-8.8.4

haskell.compiler.integer-simple.ghc88    ghc-integer-simple-8.8.4

haskell.compiler.integer-simple.ghc884   ghc-integer-simple-8.8.4

haskell.compiler.native-bignum.ghc90     ghc-native-bignum-9.0.2

haskell.compiler.native-bignum.ghc902    ghc-native-bignum-9.0.2

haskell.compiler.native-bignum.ghc92     ghc-native-bignum-9.2.4

haskell.compiler.native-bignum.ghc924    ghc-native-bignum-9.2.4

haskell.compiler.native-bignum.ghc925    ghc-native-bignum-9.2.5

haskell.compiler.native-bignum.ghc926    ghc-native-bignum-9.2.6

haskell.compiler.native-bignum.ghc92     ghc-native-bignum-9.2.7

haskell.compiler.native-bignum.ghc927    ghc-native-bignum-9.2.7

haskell.compiler.native-bignum.ghc942    ghc-native-bignum-9.4.2

haskell.compiler.native-bignum.ghc943    ghc-native-bignum-9.4.3

haskell.compiler.native-bignum.ghc94     ghc-native-bignum-9.4.4
@@ -105,15 +109,15 @@ Each of those compiler versions has a corresponding attribute set built using 
it. However, the non-standard package sets are not tested regularly and, as a

result, contain fewer working packages. The corresponding package set for GHC

9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias

for `haskell.packages.ghc924`:

for `haskell.packages.ghc927`:



```console

$ nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc924

haskell.packages.ghc924.a50                                                         a50-0.5

haskell.packages.ghc924.AAI                                                         AAI-0.2.0.1

haskell.packages.ghc924.aasam                                                       aasam-0.2.0.0

haskell.packages.ghc924.abacate                                                     abacate-0.0.0.0

haskell.packages.ghc924.abc-puzzle                                                  abc-puzzle-0.2.1

$ nix-env -f '<nixpkgs>' -qaP -A haskell.packages.ghc927

haskell.packages.ghc927.a50                                                         a50-0.5

haskell.packages.ghc927.AAI                                                         AAI-0.2.0.1

haskell.packages.ghc927.aasam                                                       aasam-0.2.0.0

haskell.packages.ghc927.abacate                                                     abacate-0.0.0.0

haskell.packages.ghc927.abc-puzzle                                                  abc-puzzle-0.2.1

…

```

lib/systems/doubles.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ let 
    "x86_64-solaris"



    # JS

    "js-ghcjs"

    "javascript-ghcjs"



    # Linux

    "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"

lib/systems/examples.nix

+4 −1
Original line number Diff line number Diff line
@@ -329,6 +329,9 @@ rec { 


  # Ghcjs

  ghcjs = {

    config = "js-unknown-ghcjs";

    # This triple is special to GHC/Cabal/GHCJS and not recognized by autotools

    # See: https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c

    # https://github.com/ghcjs/ghcjs/issues/53

    config = "javascript-unknown-ghcjs";

  };

}

lib/systems/inspect.nix

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ rec { 
    isM68k         = { cpu = { family = "m68k"; }; };

    isS390         = { cpu = { family = "s390"; }; };

    isS390x        = { cpu = { family = "s390"; bits = 64; }; };

    isJavaScript   = { cpu = cpuTypes.js; };

    isJavaScript   = { cpu = cpuTypes.javascript; };



    is32bit        = { cpu = { bits = 32; }; };

    is64bit        = { cpu = { bits = 64; }; };

lib/systems/parse.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.