4585b46 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Re-introduce "gnome" namespace as a valid serach target.

If the searched name does not exist in "gnome2", we find it in the obsolete "gnome" hierarchy instead. Exists for the benefit of release-16.09.

commit4585b4637d0bc84ab6c0e98dd2e2280ebc7e7e50 authorPeter Simons <simons@cryp.to> dateTue 4 Oct 2016, 08:08 (10 years ago) parent950a7f4

1 file changed+1−1

unifiedsplit

src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1−1

@@ -95,7 +95,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags (Packag

9595 | otherwise = binding # (i, path # ["self",i]) -- TODO: "self" shouldn't be hardcoded.

9696

9797 goodScopes :: Set [Identifier]

98− goodScopes = Set.fromList (map ("pkgs":) [[], ["xorg"], ["xlibs"], ["gnome2"], ["gnome3"], ["kde4"]])

98+ goodScopes = Set.fromList (map ("pkgs":) [[], ["xorg"], ["xlibs"], ["gnome2"], ["gnome"], ["gnome3"], ["kde4"]])

9999

100100 resolveInNixpkgs :: Identifier -> Binding

101101 resolveInNixpkgs i