diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Revision history for distribution-nixpkgs +## 1.7.1 + +* GHC and nixpkgs now + [use the system double `javascript-ghcjs`](https://github.com/NixOS/nixpkgs/commit/471b9cab41b218080f5e9f4abbc83eaaa60c6abf) + instead of `js-ghcjs` to match Cabal's default rendering. With this release, + `distribution-nixpkgs` does the same. + Note that this means that this release needs to be used with nixpkgs unstable + after [97d55ec](https://github.com/NixOS/nixpkgs/commit/97d55ec923b0cd3798a6a84e2e0a6b2c6b54f6a9) + or nixpkgs stable 23.05 or newer. + ## 1.7.0.1 * Adapt test suite to changed representation of some `Platform`s in Cabal 3.8. diff --git a/derivation-attr-paths.nix b/derivation-attr-paths.nix --- a/derivation-attr-paths.nix +++ b/derivation-attr-paths.nix @@ -34,8 +34,8 @@ if !success then [] else if lib.isDerivation value then [ path - ] else if recurseInto path x then lib.concatLists ( - lib.mapAttrsToList (n: go (path ++ [ n ])) x + ] else if recurseInto path value then lib.concatLists ( + lib.mapAttrsToList (n: go (path ++ [ n ])) value ) else []; in go []; in diff --git a/distribution-nixpkgs.cabal b/distribution-nixpkgs.cabal --- a/distribution-nixpkgs.cabal +++ b/distribution-nixpkgs.cabal @@ -1,12 +1,12 @@ name: distribution-nixpkgs -version: 1.7.0.1 +version: 1.7.1 synopsis: Types and functions to manipulate the Nixpkgs distribution description: Types and functions to represent, query, and manipulate the Nixpkgs distribution. license: BSD3 license-file: LICENSE author: Peter Simons maintainer: sternenseemann -tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2 +tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.5 category: Distribution, Nix homepage: https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme bug-reports: https://github.com/NixOS/cabal2nix/issues diff --git a/src/Distribution/Nixpkgs/Meta.hs b/src/Distribution/Nixpkgs/Meta.hs --- a/src/Distribution/Nixpkgs/Meta.hs +++ b/src/Distribution/Nixpkgs/Meta.hs @@ -84,7 +84,6 @@ I386 -> "i686" -- rendered as i386 by default PPC -> "powerpc" -- rendered as ppc by default PPC64 -> "powerpc64" -- rendered as ppc64 by default - JavaScript -> "js" -- rendered as javascript by default _ -> CabalPretty.prettyShow arch nixOs = case os of @@ -169,7 +168,7 @@ -- Just (Platform PPC OSX) -- >>> cabalPlatformFromSystem "powerpc64le-linux" -- Just (Platform (OtherArch "powerpc64le") Linux) --- >>> cabalPlatformFromSystem "js-ghcjs" +-- >>> cabalPlatformFromSystem "javascript-ghcjs" -- Just (Platform JavaScript Ghcjs) cabalPlatformFromSystem :: String -> Maybe Platform cabalPlatformFromSystem s = @@ -201,7 +200,6 @@ parseArch as = case classifyArch Strict as of OtherArch "i686" -> I386 - OtherArch "js" -> JavaScript OtherArch "powerpc" -> PPC OtherArch "powerpc64" -> PPC64 a -> a diff --git a/test/data/all-system-tuples.json b/test/data/all-system-tuples.json --- a/test/data/all-system-tuples.json +++ b/test/data/all-system-tuples.json @@ -1,1 +1,1 @@ -["aarch64-darwin","aarch64-genode","aarch64-linux","aarch64-netbsd","aarch64-none","aarch64_be-none","arm-none","armv5tel-linux","armv6l-linux","armv6l-netbsd","armv6l-none","armv7a-darwin","armv7a-linux","armv7a-netbsd","armv7l-linux","armv7l-netbsd","avr-none","i686-cygwin","i686-darwin","i686-freebsd","i686-genode","i686-linux","i686-netbsd","i686-none","i686-openbsd","i686-windows","js-ghcjs","m68k-linux","m68k-netbsd","m68k-none","microblaze-linux","microblaze-none","microblazeel-linux","microblazeel-none","mips-linux","mips64-linux","mips64el-linux","mipsel-linux","mipsel-netbsd","mmix-mmixware","msp430-none","or1k-none","powerpc-netbsd","powerpc-none","powerpc64-linux","powerpc64le-linux","powerpcle-none","riscv32-linux","riscv32-netbsd","riscv32-none","riscv64-linux","riscv64-netbsd","riscv64-none","rx-none","s390-linux","s390-none","s390x-linux","s390x-none","vc4-none","wasm32-wasi","wasm64-wasi","x86_64-cygwin","x86_64-darwin","x86_64-freebsd","x86_64-genode","x86_64-linux","x86_64-netbsd","x86_64-none","x86_64-openbsd","x86_64-redox","x86_64-solaris","x86_64-windows"] +["aarch64-darwin","aarch64-genode","aarch64-linux","aarch64-netbsd","aarch64-none","aarch64_be-none","arm-none","armv5tel-linux","armv6l-linux","armv6l-netbsd","armv6l-none","armv7a-darwin","armv7a-linux","armv7a-netbsd","armv7l-linux","armv7l-netbsd","avr-none","i686-cygwin","i686-darwin","i686-freebsd","i686-genode","i686-linux","i686-netbsd","i686-none","i686-openbsd","i686-windows","javascript-ghcjs","loongarch64-linux","m68k-linux","m68k-netbsd","m68k-none","microblaze-linux","microblaze-none","microblazeel-linux","microblazeel-none","mips-linux","mips-none","mips64-linux","mips64-none","mips64el-linux","mipsel-linux","mipsel-netbsd","mmix-mmixware","msp430-none","or1k-none","powerpc-netbsd","powerpc-none","powerpc64-linux","powerpc64le-linux","powerpcle-none","riscv32-linux","riscv32-netbsd","riscv32-none","riscv64-linux","riscv64-netbsd","riscv64-none","rx-none","s390-linux","s390-none","s390x-linux","s390x-none","vc4-none","wasm32-wasi","wasm64-wasi","x86_64-cygwin","x86_64-darwin","x86_64-freebsd","x86_64-genode","x86_64-linux","x86_64-netbsd","x86_64-none","x86_64-openbsd","x86_64-redox","x86_64-solaris","x86_64-windows"] diff --git a/test/hspec.hs b/test/hspec.hs --- a/test/hspec.hs +++ b/test/hspec.hs @@ -75,7 +75,8 @@ , ("i686-none", Platform I386 (OtherOS "none")) , ("i686-openbsd", Platform I386 OpenBSD) , ("i686-windows", Platform I386 Windows) - , ("js-ghcjs", Platform JavaScript Ghcjs) + , ("javascript-ghcjs", Platform JavaScript Ghcjs) + , ("loongarch64-linux", Platform (OtherArch "loongarch64") Linux) , ("m68k-linux", Platform M68k Linux) , ("m68k-netbsd", Platform M68k NetBSD) , ("m68k-none", Platform M68k (OtherOS "none")) @@ -83,6 +84,10 @@ , ("microblazeel-linux", Platform (OtherArch "microblazeel") Linux) , ("microblaze-none", Platform (OtherArch "microblaze") (OtherOS "none")) , ("microblazeel-none", Platform (OtherArch "microblazeel") (OtherOS "none")) + , ("mips-linux", Platform Mips Linux) + , ("mips-none", Platform Mips (OtherOS "none")) + , ("mips64-linux", Platform (OtherArch "mips64") Linux) + , ("mips64-none", Platform (OtherArch "mips64") (OtherOS "none")) , ("mips64el-linux", Platform (OtherArch "mips64el") Linux) , ("mipsel-linux", Platform (OtherArch "mipsel") Linux) , ("mipsel-netbsd", Platform (OtherArch "mipsel") NetBSD) @@ -130,8 +135,7 @@ , ("x86_64-solaris", Platform X86_64 Solaris) , ("x86_64-windows", Platform X86_64 Windows) -- lib.systems.examples - , ("mips-linux", Platform Mips Linux) - , ("mips64-linux", Platform (OtherArch "mips64") Linux) + -- Currently no tuples are unique to the example list. ] platformMapping :: [(String, NixpkgsPlatform)]