git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: disable aliases before discovering known Nixpkgs attributes
87c9b8dPeter Simons
cabal2nix.cabal+2−2
compare with master
unifiedsplit
@@ -115,7 +115,7 @@ library
115 , containers
115 , containers
116 , deepseq >= 1.4
116 , deepseq >= 1.4
117 , directory
117 , directory
118− , distribution-nixpkgs >= 1.1.1
118+ , distribution-nixpkgs >= 1.2
119 , filepath
119 , filepath
120 , hackage-db >= 2.0.1
120 , hackage-db >= 2.0.1
121 , hopenssl >= 2
121 , hopenssl >= 2
@@ -165,7 +165,7 @@ executable hackage2nix
165 , cabal2nix
165 , cabal2nix
166 , containers
166 , containers
167 , directory
167 , directory
168− , distribution-nixpkgs >= 1.1.1
168+ , distribution-nixpkgs >= 1.2
169 , filepath
169 , filepath
170 , hopenssl >= 2
170 , hopenssl >= 2
171 , language-nix
171 , language-nix
hackage2nix/Main.hs+1−1
@@ -71,7 +71,7 @@ main = do
71 CLI {..} <- execParser pinfo
71 CLI {..} <- execParser pinfo
72
72
73 config <- readConfiguration (nixpkgsRepository </> configFile)
73 config <- readConfiguration (nixpkgsRepository </> configFile)
74− nixpkgs <- readNixpkgPackageMap nixpkgsRepository Nothing
74+ nixpkgs <- readNixpkgPackageMap ["-f", nixpkgsRepository, "--arg", "config", "{ allowAliases = false; }"]
75 preferredVersions <- readPreferredVersions (fromMaybe (hackageRepository </> "preferred-versions") preferredVersionsFile)
75 preferredVersions <- readPreferredVersions (fromMaybe (hackageRepository </> "preferred-versions") preferredVersionsFile)
76 let fixup = Map.delete "acme-everything" -- TODO: https://github.com/NixOS/cabal2nix/issues/164
76 let fixup = Map.delete "acme-everything" -- TODO: https://github.com/NixOS/cabal2nix/issues/164
77 . Map.delete "som" -- TODO: https://github.com/NixOS/cabal2nix/issues/164
77 . Map.delete "som" -- TODO: https://github.com/NixOS/cabal2nix/issues/164