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: d17f136892e2
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fee185e334fa
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 20, 2018

  1. Alias pkg-config build tool to pkgconfig.

    @peti
    peti committed Nov 20, 2018
    Copy the full SHA
    fee185e View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
1 change: 1 addition & 0 deletions src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
View file
Original file line number Diff line number Diff line change
@@ -194,6 +194,7 @@ buildToolNixName "nix-env" = return "nix"
buildToolNixName "nix-hash" = return "nix"
buildToolNixName "nix-instantiate" = return "nix"
buildToolNixName "nix-store" = return "nix"
buildToolNixName "pkg-config" = return "pkgconfig"
buildToolNixName x = return (fromString x)

-- | Helper function to extract the package name from a String that may or may