94896d0 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Distribution.Nix is now called Distribution.Nixpkgs.

commit94896d00cc1c8cefae598c05675afb85dc7c8d5f authorPeter Simons <simons@cryp.to> dateMon 26 Jan 2015, 17:30 (12 years ago) parent3aec2f6

17 files changed+33−34

compare with master

unifiedsplit

src/Cabal2Nix/Generate.hs+1−1

@@ -6,7 +6,7 @@ import Cabal2Nix.Normalize

66import Cabal2Nix.PostProcess

77import Data.Maybe

88import Distribution.Compiler

9−import Distribution.Nix.Derivation.Cabal

9+import Distribution.Nixpkgs.Derivation.Cabal

1010import qualified Distribution.Package as Cabal

1111import qualified Distribution.PackageDescription as Cabal

1212import Distribution.PackageDescription.Configuration

src/Cabal2Nix/License.hs+2−2

@@ -1,10 +1,10 @@

11module Cabal2Nix.License ( fromCabalLicense ) where

3−import Distribution.Nix.Derivation.License

3+import Distribution.Nixpkgs.Derivation.License

44import Distribution.License ( License(..) )

55import Data.Version

7−fromCabalLicense :: Distribution.License.License -> Distribution.Nix.Derivation.License.License

7+fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.Derivation.License.License

88fromCabalLicense (GPL Nothing) = Unknown (Just "GPL")

99fromCabalLicense (GPL (Just (Version [2] []))) = Known "stdenv.lib.licenses.gpl2"

1010fromCabalLicense (GPL (Just (Version [3] []))) = Known "stdenv.lib.licenses.gpl3"

src/Cabal2Nix/Normalize.hs+2−2

@@ -9,8 +9,8 @@ import Data.Set ( Set )

99import qualified Data.Set as Set

1010import Data.Function

1111import Data.List

12−import Distribution.Nix.Derivation.Cabal

13−import Distribution.Nix.Util.Regex ( regsubmatch )

12+import Distribution.Nixpkgs.Derivation.Cabal

13+import Distribution.Nixpkgs.Util.Regex ( regsubmatch )

1414import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )

1515import Distribution.Simple.Utils ( lowercase )

1616

src/Cabal2Nix/Package.hs+2−2

@@ -6,8 +6,8 @@ import Control.Monad.IO.Class

66import Control.Monad.Trans.Maybe

77import Data.List ( isSuffixOf, isPrefixOf )

88import Data.Maybe ( listToMaybe )

9−import Distribution.Nix.Derivation.Cabal

10−import Distribution.Nix.Fetch

9+import Distribution.Nixpkgs.Derivation.Cabal

10+import Distribution.Nixpkgs.Fetch

1111import Distribution.Text ( simpleParse )

1212import System.Directory ( doesDirectoryExist, doesFileExist, createDirectoryIfMissing, getHomeDirectory, getDirectoryContents )

1313import System.Exit ( exitFailure )

src/Cabal2Nix/PostProcess.hs+1−1

@@ -3,7 +3,7 @@

33module Cabal2Nix.PostProcess ( postProcess ) where

55import qualified Data.Set as Set

6−import Distribution.Nix.Derivation.Cabal

6+import Distribution.Nixpkgs.Derivation.Cabal

77import Distribution.Text ( display )

99postProcess :: Derivation -> Derivation

src/Distribution/Nix/Derivation/Cabal.hs → src/Distribution/Nixpkgs/Derivation/Cabal.hsrenamed+5−5

@@ -1,11 +1,11 @@

11{-# LANGUAGE PatternGuards, RecordWildCards, DeriveGeneric, StandaloneDeriving #-}

22{-# OPTIONS_GHC -fno-warn-orphans #-} -- for FlagName below

4−module Distribution.Nix.Derivation.Cabal

4+module Distribution.Nixpkgs.Derivation.Cabal

55 ( Derivation(..)

66 , renderDerivation

77 , DerivationSource(..)

8− , module Distribution.Nix.Derivation.Meta

8+ , module Distribution.Nixpkgs.Derivation.Meta

99 , module Data.Version

1010 )

1111 where

@@ -17,9 +17,9 @@ import qualified Data.Set as Set

1717import Data.Function

1818import Data.List

1919import Data.Version

20−import Distribution.Nix.Derivation.Meta

21−import Distribution.Nix.Fetch

22−import Distribution.Nix.Util.PrettyPrinting

20+import Distribution.Nixpkgs.Derivation.Meta

21+import Distribution.Nixpkgs.Fetch

22+import Distribution.Nixpkgs.Util.PrettyPrinting

2323import Distribution.Package

2424import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )

2525import GHC.Generics ( Generic )

src/Distribution/Nix/Derivation/License.hs → src/Distribution/Nixpkgs/Derivation/License.hsrenamed+2−2

@@ -5,11 +5,11 @@

55 are represented as a literal string.

66 -}

8−module Distribution.Nix.Derivation.License ( License(..) ) where

8+module Distribution.Nixpkgs.Derivation.License ( License(..) ) where

1010import Control.DeepSeq.Generics

1111import Data.Maybe

12−import Distribution.Nix.Util.PrettyPrinting

12+import Distribution.Nixpkgs.Util.PrettyPrinting

1313import GHC.Generics ( Generic )

1414

1515-- | The representation for licenses used in Nix derivations. Known

src/Distribution/Nix/Derivation/Meta.hs → src/Distribution/Nixpkgs/Derivation/Meta.hsrenamed+4−4

@@ -5,15 +5,15 @@

55 of the Nixpkgs manual at <http://nixos.org/nixpkgs/docs.html>.

66 -}

8−module Distribution.Nix.Derivation.Meta

8+module Distribution.Nixpkgs.Derivation.Meta

99 ( Meta(..)

10− , module Distribution.Nix.Derivation.License

10+ , module Distribution.Nixpkgs.Derivation.License

1111 )

1212 where

1313

1414import Control.DeepSeq.Generics

15−import Distribution.Nix.Derivation.License

16−import Distribution.Nix.Util.PrettyPrinting

15+import Distribution.Nixpkgs.Derivation.License

16+import Distribution.Nixpkgs.Util.PrettyPrinting

1717import GHC.Generics ( Generic )

1818import Data.Set ( Set )

1919import qualified Data.Set as Set

src/Distribution/Nix/Fetch.hs → src/Distribution/Nixpkgs/Fetch.hsrenamed+1−1

@@ -2,7 +2,7 @@

22{-# LANGUAGE RecordWildCards #-}

33{-# LANGUAGE ScopedTypeVariables #-}

44{-# LANGUAGE DeriveGeneric #-}

5−module Distribution.Nix.Fetch

5+module Distribution.Nixpkgs.Fetch

66 ( Source(..)

77 , DerivationSource(..), fromDerivationSource

88 , fetch

src/Distribution/Nix/PackageMap.hs → src/Distribution/Nixpkgs/PackageMap.hsrenamed+1−1

@@ -1,4 +1,4 @@

1−module Distribution.Nix.PackageMap where

1+module Distribution.Nixpkgs.PackageMap where

33import qualified Data.Aeson as JSON

44import Data.List.Split

src/Distribution/Nix/Util/PrettyPrinting.hs → src/Distribution/Nixpkgs/Util/PrettyPrinting.hsrenamed+1−1

@@ -1,6 +1,6 @@

11-- | Internal pretty-printing helpers for Nix expressions.

3−module Distribution.Nix.Util.PrettyPrinting

3+module Distribution.Nixpkgs.Util.PrettyPrinting

44 ( onlyIf

55 , listattr

66 , boolattr

src/Distribution/Nix/Util/Regex.hs → src/Distribution/Nixpkgs/Util/Regex.hsrenamed+1−1

@@ -1,4 +1,4 @@

1−module Distribution.Nix.Util.Regex

1+module Distribution.Nixpkgs.Util.Regex

22 ( module Text.Regex.Posix

33 , regsubmatch

44 )

src/Language/Nix/Identifier.hs+1−1

@@ -6,7 +6,7 @@ import Data.Char

66import Data.Function

77import Control.Lens

88import Data.String

9−import Distribution.Nix.Util.PrettyPrinting ( Pretty(..), text )

9+import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty(..), text )

1010import Text.Regex.Posix

1111

1212-- | Identifiers in Nix are essentially strings. Reasonable people restrict

src/Language/Nix/Path.hs+1−2

@@ -3,8 +3,7 @@ module Language.Nix.Path ( Path, mkPath, path ) where

44import Control.Lens

55import Control.Applicative

6−import Data.String

7−import Distribution.Nix.Util.PrettyPrinting ( Pretty(..), text, punctuate, hcat, char )

6+import Distribution.Nixpkgs.Util.PrettyPrinting ( Pretty(..), punctuate, hcat, char )

87import Language.Nix.Identifier

109-- | Paths are non-empty lists of identifiers in Nix.

src/cabal2nix.hs+3−3

@@ -6,9 +6,9 @@ import Cabal2Nix.Package

66import Cabal2Nix.Version

77import Control.Exception ( bracket )

88import Control.Monad ( when )

9−import Distribution.Nix.Derivation.Cabal hiding ( version )

10−import Distribution.Nix.Fetch

11−import Distribution.Nix.Util.PrettyPrinting

9+import Distribution.Nixpkgs.Derivation.Cabal hiding ( version )

10+import Distribution.Nixpkgs.Fetch

11+import Distribution.Nixpkgs.Util.PrettyPrinting

1212import Distribution.PackageDescription ( FlagName(..), FlagAssignment )

1313import System.Console.GetOpt ( OptDescr(..), ArgDescr(..), ArgOrder(..), usageInfo, getOpt )

1414import System.Environment ( getArgs )

src/hackage2nix.hs+3−3

@@ -21,9 +21,9 @@ import Data.Monoid

2121import Data.Set ( Set )

2222import qualified Data.Set as Set

2323import Distribution.Compiler

24−import Distribution.Nix.Derivation.Cabal

25−import Distribution.Nix.PackageMap

26−import Distribution.Nix.Util.PrettyPrinting hiding ( attr, (<>) )

24+import Distribution.Nixpkgs.Derivation.Cabal

25+import Distribution.Nixpkgs.PackageMap

26+import Distribution.Nixpkgs.Util.PrettyPrinting hiding ( attr, (<>) )

2727import Distribution.Package

2828import Distribution.PackageDescription hiding ( buildDepends, extraLibs, buildTools )

2929import Distribution.PackageDescription.Configuration

test/spec.hs+2−2

@@ -3,8 +3,8 @@ module Main ( main ) where

33import Control.DeepSeq

44import Control.Exception

55import Data.Set ( empty )

6−import Distribution.Nix.Derivation.License

7−import Distribution.Nix.Derivation.Meta

6+import Distribution.Nixpkgs.Derivation.License

7+import Distribution.Nixpkgs.Derivation.Meta

88import System.Process

99import Test.Hspec

1010import Test.Hspec.QuickCheck