Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cfec46d9b414
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11a103bdb960
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2020

  1. Copy the full SHA
    11a103b View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs
1 change: 1 addition & 0 deletions src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ instance IsString Platform where
fromString "i686-linux" = Platform I386 Linux
fromString "x86_64-linux" = Platform X86_64 Linux
fromString "x86_64-darwin" = Platform X86_64 OSX
fromString "armv7l-linux" = Platform (OtherArch "armv7l") Linux
fromString s = error ("fromString: " ++ show s ++ " is not a valid platform")

instance FromJSON Platform where