Move Configuration.hs module back into distribution-nixpkgs.
The module Distribution.Nixpkgs.Haskell.FromCabal.Configuration is required by
programs other than hackage2nix; so it must live in the re-usable library
instead of the hackage2nix source tree.
commitf2a512ba6046e8f9b237fea697f28666b0b5efbb
authorPeter Simons <simons@cryp.to>
dateTue 8 Sep 2015, 14:46 (11 years ago)
parent5daa38a
distribution-nixpkgs/distribution-nixpkgs.cabal+1
@@ -53,6 +53,7 @@ library
5353 Distribution.Nixpkgs.Haskell.Constraint
5454 Distribution.Nixpkgs.Haskell.Derivation
5555 Distribution.Nixpkgs.Haskell.FromCabal
56+ Distribution.Nixpkgs.Haskell.FromCabal.Configuration
5657 Distribution.Nixpkgs.Haskell.FromCabal.Flags
5758 Distribution.Nixpkgs.Haskell.FromCabal.License
5859 Distribution.Nixpkgs.Haskell.FromCabal.Name
distribution-nixpkgs/package.yaml+1
@@ -42,6 +42,7 @@ library:
4242 - Distribution.Nixpkgs.Haskell.Constraint
4343 - Distribution.Nixpkgs.Haskell.Derivation
4444 - Distribution.Nixpkgs.Haskell.FromCabal
45+ - Distribution.Nixpkgs.Haskell.FromCabal.Configuration
4546 - Distribution.Nixpkgs.Haskell.FromCabal.Flags
4647 - Distribution.Nixpkgs.Haskell.FromCabal.License
4748 - Distribution.Nixpkgs.Haskell.FromCabal.Name
hackage2nix/src/Configuration.hs → distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hsrenamed+1−1
@@ -3,7 +3,7 @@
33{-# LANGUAGE DeriveGeneric #-}
44{-# OPTIONS_GHC -fno-warn-orphans #-}
55
6−module Configuration ( Configuration(..), readConfiguration, assertConsistency ) where
6+module Distribution.Nixpkgs.Haskell.FromCabal.Configuration ( Configuration(..), readConfiguration, assertConsistency ) where
77
88import Control.DeepSeq.Generics
99import Control.Lens
hackage2nix/hackage2nix.cabal−1
@@ -41,6 +41,5 @@ executable hackage2nix
4141 , text
4242 , yaml
4343 other-modules:
44− Configuration
4544 Paths_hackage2nix
4645 default-language: Haskell2010
hackage2nix/package.yaml−1
@@ -31,7 +31,6 @@ executables:
3131 main: Main.hs
3232 source-dirs: src
3333 other-modules:
34− - Configuration
3534 - Paths_hackage2nix
3635 ghc-options:
3736 - -threaded
hackage2nix/src/Main.hs+1−1
@@ -3,7 +3,6 @@
33
44module Main ( main ) where
55
6−import Configuration
76import Control.Lens
87import Control.Monad
98import Control.Monad.Par.Combinator
@@ -21,6 +20,7 @@ import Distribution.Nixpkgs.Fetch
2120import Distribution.Nixpkgs.Haskell
2221import Distribution.Nixpkgs.Haskell.Constraint
2322import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
23+import Distribution.Nixpkgs.Haskell.FromCabal.Configuration
2424import Distribution.Nixpkgs.Haskell.FromCabal.Flags
2525import Distribution.Nixpkgs.Haskell.HackageGit ( readHackage, Hackage )
2626import Distribution.Nixpkgs.Haskell.PackageSourceSpec