aff02b1...master · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

.travis.yml+52−44

since splitsnapshots

@@ -1,12 +1,14 @@

1# This Travis job script has been generated by a script via

3−# haskell-ci '--installed=+all -Cabal' '--hlint' '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '-o' '.travis.yml' 'cabal2nix.cabal'

3+# haskell-ci '--installed=+all -Cabal' '--hlint' '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '-o' '.travis.yml' 'cabal2nix.cabal' '--head-hackage' '--head-hackage-jobs' '> 8.8'

5# For more information, see https://github.com/haskell-CI/haskell-ci

7−# version: 0.5.20190916

7+# version: 0.9.20200306

9+version: ~> 1.0

9language: c

10language: c

11+os: linux

10dist: xenial

12dist: xenial

11git:

13git:

12 # whether to recursively clone submodules

14 # whether to recursively clone submodules

@@ -15,6 +17,7 @@ cache:

15 directories:

17 directories:

16 - $HOME/.cabal/packages

18 - $HOME/.cabal/packages

17 - $HOME/.cabal/store

19 - $HOME/.cabal/store

20+ - $HOME/.hlint

18before_cache:

21before_cache:

19 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

22 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

20 # remove files that are regenerated by 'cabal update'

23 # remove files that are regenerated by 'cabal update'

@@ -24,12 +27,20 @@ before_cache:

24 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

25 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

26 - rm -rfv $CABALHOME/packages/head.hackage

29 - rm -rfv $CABALHOME/packages/head.hackage

27−matrix:

30+jobs:

28 include:

31 include:

29− - compiler: ghc-8.8.1

32+ - compiler: ghc-8.10.1

33+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}

34+ os: linux

35+ - compiler: ghc-8.8.3

30− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

36+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.0"]}}

37+ os: linux

31 - compiler: ghc-8.6.5

38 - compiler: ghc-8.6.5

32− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}

39+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}

40+ os: linux

41+ allow_failures:

42+ - compiler: ghc-8.8.3

43+ - compiler: ghc-8.10.1

33before_install:

44before_install:

34 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

45 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

35 - WITHCOMPILER="-w $HC"

46 - WITHCOMPILER="-w $HC"

@@ -42,32 +53,12 @@ before_install:

42 - TOP=$(pwd)

53 - TOP=$(pwd)

43 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"

54 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"

44 - echo $HCNUMVER

55 - echo $HCNUMVER

45− - CABAL="$CABAL -vnormal+nowrap+markoutput"

56+ - CABAL="$CABAL -vnormal+nowrap"

46 - set -o pipefail

57 - set -o pipefail

47− - |

48− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk

49− echo 'BEGIN { state = "output"; }' >> .colorful.awk

50− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk

51− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk

52− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk

53− echo ' if (state == "cabal") {' >> .colorful.awk

54− echo ' print blue($0)' >> .colorful.awk

55− echo ' } else {' >> .colorful.awk

56− echo ' print $0' >> .colorful.awk

57− echo ' }' >> .colorful.awk

58− echo '}' >> .colorful.awk

59− - cat .colorful.awk

60− - |

61− color_cabal_output () {

62− awk -f $TOP/.colorful.awk

63− }

64− - echo text | color_cabal_output

65−install:

66− - ${CABAL} --version

67− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

68 - TEST=--enable-tests

58 - TEST=--enable-tests

69 - BENCH=--enable-benchmarks

59 - BENCH=--enable-benchmarks

70 - HEADHACKAGE=false

60 - HEADHACKAGE=false

61+ - if [ $HCNUMVER -ge 80800 ] ; then HEADHACKAGE=true ; fi

71 - rm -f $CABALHOME/config

62 - rm -f $CABALHOME/config

72 - |

63 - |

73 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

64 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

@@ -85,14 +76,31 @@ install:

85 echo " prefix: $CABALHOME" >> $CABALHOME/config

76 echo " prefix: $CABALHOME" >> $CABALHOME/config

86 echo "repository hackage.haskell.org" >> $CABALHOME/config

77 echo "repository hackage.haskell.org" >> $CABALHOME/config

87 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

78 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

79+ - |

80+ if $HEADHACKAGE; then

81+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config

82+ echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config

83+ echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config

84+ echo " secure: True" >> $CABALHOME/config

85+ echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config

86+ echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config

87+ echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config

88+ echo " key-threshold: 3" >> $CABALHOME/config

89+ fi

90+install:

91+ - ${CABAL} --version

92+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

88 - |

93 - |

89 echo "program-default-options" >> $CABALHOME/config

94 echo "program-default-options" >> $CABALHOME/config

90 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

95 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

91 - cat $CABALHOME/config

96 - cat $CABALHOME/config

92 - rm -fv cabal.project cabal.project.local cabal.project.freeze

97 - rm -fv cabal.project cabal.project.local cabal.project.freeze

93 - travis_retry ${CABAL} v2-update -v

98 - travis_retry ${CABAL} v2-update -v

94− - (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.*' | color_cabal_output)

99+ - (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 doctest --constraint='doctest ==0.16.2.*')

95− - if [ $HCNUMVER -ge 80800 ] ; then (cd /tmp && ${CABAL} v2-install $WITHCOMPILER -j2 hlint --constraint='hlint ==2.1.*' | color_cabal_output) ; fi

100+ - if [ $HCNUMVER -lt 80800 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $WITHCOMPILER --dry-run hlint --constraint='hlint ==2.2.*' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi

101+ - "if [ $HCNUMVER -lt 80800 ] ; then if [ ! -e $HOME/.hlint/hlint-$HLINTVER/hlint ]; then echo \"Downloading HLint version $HLINTVER\"; mkdir -p $HOME/.hlint; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\\n' --silent --location --output $HOME/.hlint/hlint-$HLINTVER.tar.gz \"https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz\"; tar -xzv -f $HOME/.hlint/hlint-$HLINTVER.tar.gz -C $HOME/.hlint; fi ; fi"

102+ - if [ $HCNUMVER -lt 80800 ] ; then mkdir -p $CABALHOME/bin && ln -sf "$HOME/.hlint/hlint-$HLINTVER/hlint" $CABALHOME/bin/hlint ; fi

103+ - if [ $HCNUMVER -lt 80800 ] ; then hlint --version ; fi

96 # Generate cabal.project

104 # Generate cabal.project

97 - rm -rf cabal.project cabal.project.local cabal.project.freeze

105 - rm -rf cabal.project cabal.project.local cabal.project.freeze

98 - touch cabal.project

106 - touch cabal.project

@@ -103,15 +111,15 @@ install:

103 - cat cabal.project || true

111 - cat cabal.project || true

104 - cat cabal.project.local || true

112 - cat cabal.project.local || true

105 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

113 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

106− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output

114+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}

107 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

115 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

108 - rm cabal.project.freeze

116 - rm cabal.project.freeze

109− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output

117+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all

110− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output

118+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all

111script:

119script:

112 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

120 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

113 # Packaging...

121 # Packaging...

114− - ${CABAL} v2-sdist all | color_cabal_output

122+ - ${CABAL} v2-sdist all

115 # Unpacking...

123 # Unpacking...

116 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

124 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

117 - cd ${DISTDIR} || false

125 - cd ${DISTDIR} || false

@@ -129,25 +137,25 @@ script:

129 - cat cabal.project.local || true

137 - cat cabal.project.local || true

130 # Building...

138 # Building...

131 # this builds all libraries and executables (without tests/benchmarks)

139 # this builds all libraries and executables (without tests/benchmarks)

132− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output

140+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

133 # Building with tests and benchmarks...

141 # Building with tests and benchmarks...

134 # build & run tests, build benchmarks

142 # build & run tests, build benchmarks

135− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

143+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all

136 # Testing...

144 # Testing...

137− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

145+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all

138 # Doctest...

146 # Doctest...

139− - (cd ${PKGDIR_cabal2nix} && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XMonadFailDesugaring src)

147+ - (cd ${PKGDIR_cabal2nix} && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen src)

140 # HLint..

148 # HLint..

141− - if [ $HCNUMVER -ge 80800 ] ; then (cd ${PKGDIR_cabal2nix} && hlint -XMonadFailDesugaring src) ; fi

149+ - if [ $HCNUMVER -lt 80800 ] ; then (cd ${PKGDIR_cabal2nix} && hlint src) ; fi

142− - if [ $HCNUMVER -ge 80800 ] ; then (cd ${PKGDIR_cabal2nix} && hlint -XMonadFailDesugaring hackage2nix) ; fi

150+ - if [ $HCNUMVER -lt 80800 ] ; then (cd ${PKGDIR_cabal2nix} && hlint hackage2nix) ; fi

143− - if [ $HCNUMVER -ge 80800 ] ; then (cd ${PKGDIR_cabal2nix} && hlint -XMonadFailDesugaring cabal2nix) ; fi

151+ - if [ $HCNUMVER -lt 80800 ] ; then (cd ${PKGDIR_cabal2nix} && hlint cabal2nix) ; fi

144 # cabal check...

152 # cabal check...

145 - (cd ${PKGDIR_cabal2nix} && ${CABAL} -vnormal check)

153 - (cd ${PKGDIR_cabal2nix} && ${CABAL} -vnormal check)

146 # haddock...

154 # haddock...

147− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output

155+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all

148 # Building without installed constraints for packages in global-db...

156 # Building without installed constraints for packages in global-db...

149 - rm -f cabal.project.local

157 - rm -f cabal.project.local

150− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output

158+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

151

159

152−# REGENDATA ["--installed=+all -Cabal","--hlint","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","-o",".travis.yml","cabal2nix.cabal"]

160+# REGENDATA ("0.9.20200306",["--installed=+all -Cabal","--hlint","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","-o",".travis.yml","cabal2nix.cabal","--head-hackage","--head-hackage-jobs","> 8.8"])

153# EOF

161# EOF

README.md+6−6

@@ -27,16 +27,16 @@ direct `http://host/path/pkg.cabal` URL can be provided, as well as a

27`file:///local/path/pkg.cabal` URI that doesn't depend on network access.

28However, if the source hash is not already in `cabal2nix`'s cache or provided

29using the `--sha256` option, `cabal2nix` still needs to download the source

30−code to compute the hash, which obviously still causes network traffic. Run the

30+code to compute the hash, which still causes network traffic. Run the utility

31−utility with `--help` to see the complete list of supported command line flags.

31+with `--help` to see the complete list of supported command-line flags.

33−Detailed instructions how to use those generated files with Nix can be found at

33+Detailed instructions on how to use those generated files with Nix can be found at

34https://nixos.org/nixpkgs/manual/#how-to-create-nix-builds-for-your-own-private-haskell-packages.

36`cabal2nix` can also build derivations for projects from other sources than

37−hackage. You only need to provide an URI that points to a cabal project. The

37+Hackage. You only need to provide a URI that points to a cabal project. The

38−most common usecase for this is probably to generate a derivation for a project

38+most common use-case for this is probably to generate a derivation for a

39−on the local file system:

39+project on the local file system:

41 $ cabal get mtl-2.2.1 && cd mtl-2.2.1

42 $ cabal2nix .

cabal2nix.cabal+6−10

@@ -1,5 +1,5 @@

1name: cabal2nix

2−version: 2.15.0

2+version: 2.15.1

3synopsis: Convert Cabal files into Nix build instructions.

4description:

5 Convert Cabal files into Nix build instructions. Users of Nix can install the latest

@@ -27,7 +27,7 @@ author: Peter Simons, Andres Loeh, Benno Fünfstück, Mateusz Kowalc

27 gebbert, laMudri, Александр Цамутали

28maintainer: Peter Simons <simons@cryp.to>

29stability: stable

30−tested-with: GHC == 8.6.5, GHC == 8.8.1

30+tested-with: GHC == 8.6.5, GHC == 8.8.3, GHC == 8.10.1

31category: Distribution, Nix

32homepage: https://github.com/nixos/cabal2nix#readme

33bug-reports: https://github.com/nixos/cabal2nix/issues

@@ -61,7 +61,7 @@ library

61 other-modules: Paths_cabal2nix

62 hs-source-dirs: src

63 build-depends: base > 4.11

64− , Cabal > 3

64+ , Cabal == 3.0.*

65 , aeson > 1

66 , ansi-wl-pprint

67 , bytestring

@@ -84,7 +84,6 @@ library

84 , transformers

85 , yaml

86 default-language: Haskell2010

87− default-extensions: MonadFailDesugaring

88 other-extensions: MultiParamTypeClasses

87 other-extensions: MultiParamTypeClasses

89 ScopedTypeVariables

88 ScopedTypeVariables

90 FlexibleInstances

89 FlexibleInstances

@@ -102,7 +101,6 @@ executable cabal2nix

102 hs-source-dirs: cabal2nix

101 hs-source-dirs: cabal2nix

103 build-depends: base, cabal2nix

102 build-depends: base, cabal2nix

104 default-language: Haskell2010

103 default-language: Haskell2010

105− default-extensions: MonadFailDesugaring

106 ghc-options: -Wall -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates

104 ghc-options: -Wall -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates

107 -Wredundant-constraints

105 -Wredundant-constraints

108

106

@@ -112,7 +110,7 @@ executable hackage2nix

112 Paths_cabal2nix

110 Paths_cabal2nix

113 hs-source-dirs: hackage2nix

111 hs-source-dirs: hackage2nix

114 build-depends: base < 5

112 build-depends: base < 5

115− , Cabal > 2.4

113+ , Cabal

116 , aeson

114 , aeson

117 , bytestring

115 , bytestring

118 , cabal2nix

116 , cabal2nix

@@ -129,16 +127,15 @@ executable hackage2nix

129 , optparse-applicative

127 , optparse-applicative

130 , pretty >= 1.1.2

128 , pretty >= 1.1.2

131 default-language: Haskell2010

129 default-language: Haskell2010

132− default-extensions: MonadFailDesugaring

133 ghc-options: -Wall -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates

130 ghc-options: -Wall -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates

134− -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N

131+ -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-maxN16

135

132

136test-suite regression-test

133test-suite regression-test

137 type: exitcode-stdio-1.0

134 type: exitcode-stdio-1.0

138 main-is: Main.hs

135 main-is: Main.hs

139 hs-source-dirs: test

136 hs-source-dirs: test

140 build-depends: base

137 build-depends: base

141− , Cabal > 2.4

138+ , Cabal

142 , cabal2nix

139 , cabal2nix

143 , containers

140 , containers

144 , directory

141 , directory

@@ -150,7 +147,6 @@ test-suite regression-test

150 , tasty

147 , tasty

151 , tasty-golden

148 , tasty-golden

152 default-language: Haskell2010

149 default-language: Haskell2010

153− default-extensions: MonadFailDesugaring

154 build-tools: cabal2nix

150 build-tools: cabal2nix

155 ghc-options: -Wall -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates

151 ghc-options: -Wall -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates

156 -Wredundant-constraints -threaded -with-rtsopts=-K64K

152 -Wredundant-constraints -threaded -with-rtsopts=-K64K

hackage2nix/Main.hs+1−1

@@ -10,7 +10,7 @@ import Control.Monad

10import Control.Monad.Par.Combinator

11import Control.Monad.Par.IO

12import Control.Monad.Trans ( liftIO )

13−import Data.List

13+import Data.List ( intercalate )

14import Data.Map.Strict ( Map )

15import qualified Data.Map.Strict as Map

16import Data.Maybe

src/Cabal2nix.hs+2−2

@@ -11,10 +11,9 @@ module Cabal2nix

11import Control.Exception ( bracket )

12import Control.Lens

13import Control.Monad

14−import Data.List

14+import Data.List ( intercalate, isPrefixOf )

15import Data.List.Split

16import Data.Maybe ( fromMaybe, isJust, listToMaybe )

17−import Data.Monoid ( (<>) )

18import qualified Data.Set as Set

17import qualified Data.Set as Set

19import Data.String

18import Data.String

20import Data.Time

19import Data.Time

@@ -136,6 +135,7 @@ ghcConvertOS os = case os of

136 "watchos" -> "ios"

135 "watchos" -> "ios"

137 "tvos" -> "ios"

136 "tvos" -> "ios"

138 "linux-android" -> "linux-android"

137 "linux-android" -> "linux-android"

138+ "linux-androideabi" -> "linux-androideabi"

139 _ | "linux-" `isPrefixOf` os -> "linux"

140 _ -> fromMaybe os $ listToMaybe

141 [prefix | prefix <- osPrefixes, prefix `isPrefixOf` os]

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

@@ -15,7 +15,7 @@ module Distribution.Nixpkgs.Haskell.Derivation

16import Control.DeepSeq

17import Control.Lens

18−import Data.List

18+import Data.List ( isPrefixOf )

19import Data.Set ( Set )

20import qualified Data.Set as Set

21import Data.Set.Lens

src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+8−3

@@ -4,6 +4,7 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Flags ( configureCabalFlags ) wher

5import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

7+import Data.Char

7import Distribution.Package

8import Distribution.Package

8import Distribution.PackageDescription

9import Distribution.PackageDescription

9import Distribution.Version

10import Distribution.Version

@@ -15,6 +16,7 @@ configureCabalFlags' :: PackageIdentifier -> [(FlagName,Bool)]

15configureCabalFlags' (PackageIdentifier name version)

16configureCabalFlags' (PackageIdentifier name version)

16 | name == "accelerate-examples"= [disable "opencl"]

17 | name == "accelerate-examples"= [disable "opencl"]

17 | name == "arithmoi" = [disable "llvm"]

18 | name == "arithmoi" = [disable "llvm"]

19+ | name == "bustle" = [disable "hgettext"] -- https://gitlab.freedesktop.org/bustle/bustle/issues/13

18 | name == "cabal-plan" = [enable "exe"]

20 | name == "cabal-plan" = [enable "exe"]

19 | name == "cassava" = [disable "bytestring--lt-0_10_4"]

21 | name == "cassava" = [disable "bytestring--lt-0_10_4"]

20 | name == "darcs" = [enable "library", enable "force-char8-encoding"]

22 | name == "darcs" = [enable "library", enable "force-char8-encoding"]

@@ -26,7 +28,7 @@ configureCabalFlags' (PackageIdentifier name version)

26 , enable "dbus"

28 , enable "dbus"

27 , disable "debuglocks"

29 , disable "debuglocks"

28 , enable "magicmime"

30 , enable "magicmime"

29− , disable "networkbsd"

31+ , enable "networkbsd"

30 , enable "pairing"

32 , enable "pairing"

31 , enable "production"

33 , enable "production"

32 , enable "s3"

34 , enable "s3"

@@ -57,7 +59,10 @@ configureCabalFlags' (PackageIdentifier name version)

57 | otherwise = []

59 | otherwise = []

59enable :: String -> (FlagName,Bool)

61enable :: String -> (FlagName,Bool)

60−enable name = (mkFlagName name, True)

62+enable name = (mkFlagName' name, True)

62disable :: String -> (FlagName,Bool)

64disable :: String -> (FlagName,Bool)

63−disable name = (mkFlagName name, False)

65+disable name = (mkFlagName' name, False)

66+

67+mkFlagName' :: String -> FlagName

68+mkFlagName' = mkFlagName . map toLower

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

@@ -29,6 +29,7 @@ libNixName "appindicator-0.1" = return "libappindicator-gtk2"

29libNixName "appindicator3-0.1" = return "libappindicator-gtk3"

30libNixName "asound" = return "alsaLib"

31libNixName "b2" = return "libb2"

32+libNixName "boost_context" = return "boost"

32libNixName "bz2" = return "bzip2"

33libNixName "bz2" = return "bzip2"

33libNixName "c++" = [] -- What is that?

34libNixName "c++" = [] -- What is that?

34libNixName "cairo-gobject" = return "cairo"

35libNixName "cairo-gobject" = return "cairo"

@@ -94,6 +95,8 @@ libNixName "ldap" = return "openldap"

94libNixName "libavutil" = return "ffmpeg"

95libNixName "libavutil" = return "ffmpeg"

95libNixName "libgsasl" = return "gsasl"

96libNixName "libgsasl" = return "gsasl"

96libNixName "libpcre" = return "pcre"

97libNixName "libpcre" = return "pcre"

98+libNixName "libpcre2" = return "pcre2"

99+libNixName "libpcre2-8" = libNixName "libpcre2"

97libNixName "libqrencode" = return "qrencode"

100libNixName "libqrencode" = return "qrencode"

98libNixName "libR" = return "R"

101libNixName "libR" = return "R"

99libNixName "libsoup-gnome-2.4" = return "libsoup"

102libNixName "libsoup-gnome-2.4" = return "libsoup"

@@ -200,7 +203,6 @@ buildToolNixName "nix-env" = return "nix"

200buildToolNixName "nix-hash" = return "nix"

203buildToolNixName "nix-hash" = return "nix"

201buildToolNixName "nix-instantiate" = return "nix"

204buildToolNixName "nix-instantiate" = return "nix"

202buildToolNixName "nix-store" = return "nix"

205buildToolNixName "nix-store" = return "nix"

203−buildToolNixName "pkg-config" = return "pkgconfig"

204buildToolNixName x = return (fromString x)

206buildToolNixName x = return (fromString x)

205

207

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

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

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+10−3

@@ -13,6 +13,7 @@ import Data.Set ( Set )

13import qualified Data.Set as Set

14import Distribution.Nixpkgs.Haskell

15import Distribution.Nixpkgs.Meta

16+import Distribution.Nixpkgs.License

16import Distribution.Package

17import Distribution.Package

17import Distribution.System

18import Distribution.System

18import Distribution.Text

19import Distribution.Text

@@ -78,7 +79,7 @@ hooks =

78 , ("alsa-core", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))

79 , ("alsa-core", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))

79 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))

80 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))

80 , ("bindings-lxc", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))

81 , ("bindings-lxc", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))

81− , ("bustle", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)

82+ , ("bustle", bustleOverrides)

82 , ("Cabal", set doCheck False) -- test suite doesn't work in Nix

83 , ("Cabal", set doCheck False) -- test suite doesn't work in Nix

83 , ("Cabal >2.2", over (setupDepends . haskell) (Set.union (Set.fromList [self "mtl", self "parsec"]))) -- https://github.com/haskell/cabal/issues/5391

84 , ("Cabal >2.2", over (setupDepends . haskell) (Set.union (Set.fromList [self "mtl", self "parsec"]))) -- https://github.com/haskell/cabal/issues/5391

84 , ("cabal-helper", set doCheck False) -- https://github.com/DanielG/cabal-helper/issues/17

85 , ("cabal-helper", set doCheck False) -- https://github.com/DanielG/cabal-helper/issues/17

@@ -89,7 +90,7 @@ hooks =

89 , ("dns", set testTarget "spec") -- don't execute tests that try to access the network

90 , ("dns", set testTarget "spec") -- don't execute tests that try to access the network

90 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))

91 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))

91 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))

92 , ("freenect < 1.2.1", over configureFlags (Set.union (Set.fromList ["--extra-include-dirs=${pkgs.freenect}/include/libfreenect", "--extra-lib-dirs=${pkgs.freenect}/lib"])))

92− , ("fltkhs", set (libraryDepends . system . contains (pkg "fltk14")) True . set (libraryDepends . pkgconfig . contains (pkg "libGLU_combined")) True) -- TODO: fltk14 belongs into the *setup* dependencies.

93+ , ("fltkhs", set (libraryDepends . system . contains (pkg "fltk14")) True . over (libraryDepends . pkgconfig) (Set.union (pkgs ["libGLU", "libGL"]))) -- TODO: fltk14 belongs into the *setup* dependencies.

93 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)

94 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)

94 , ("gi-cairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36

95 , ("gi-cairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36

95 , ("gi-gdk", set runHaddock True )

96 , ("gi-gdk", set runHaddock True )

@@ -255,7 +256,7 @@ gfPhaseOverrides = unlines

255 , " sed -i \"s|numJobs (bf bi)++||\" ./Setup.hs"

256 , " sed -i \"s|numJobs (bf bi)++||\" ./Setup.hs"

256 -- Parallel compilation fails. Disable it.

257 -- Parallel compilation fails. Disable it.

257 , "'';"

258 , "'';"

258− , "preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';"

259+ , "preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';"

259 -- The build step itself, after having built the library, needs to be able

260 -- The build step itself, after having built the library, needs to be able

260 -- to find the library it just built in order to compile grammar files.

261 -- to find the library it just built in order to compile grammar files.

261 ]

262 ]

@@ -400,3 +401,9 @@ pandocOverrides = set phaseOverrides postInstall

400 , " mv \"man/\"*.1 $out/share/man/man1/"

401 , " mv \"man/\"*.1 $out/share/man/man1/"

401 , "'';"

402 , "'';"

402 ]

403 ]

404+

405+bustleOverrides :: Derivation -> Derivation

406+bustleOverrides = set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True

407+ . set (executableDepends . pkgconfig . contains "gio-unix = null") False

408+ . set (metaSection . license) (Known "stdenv.lib.licenses.lgpl21Plus")

409+ . set (metaSection . hydraPlatforms) allKnownPlatforms

update-stackage.sh+2−3

@@ -25,6 +25,7 @@ sed -r \

25sed -r \

26 -e '/ cabal-install /d' \

27 -e '/ cabal2nix /d' \

28+ -e '/ cabal2spec /d' \

28 -e '/ distribution-nixpkgs /d' \

29 -e '/ distribution-nixpkgs /d' \

29 -e '/ git-annex /d' \

30 -e '/ git-annex /d' \

30 -e '/ hindent /d' \

31 -e '/ hindent /d' \

@@ -34,8 +35,6 @@ sed -r \

34 -e '/ hopenssl /d' \

35 -e '/ hopenssl /d' \

35 -e '/ jailbreak-cabal /d' \

36 -e '/ jailbreak-cabal /d' \

36 -e '/ json-autotype/d' \

37 -e '/ json-autotype/d' \

37− -e '/ lambdabot-core /d' \

38− -e '/ lambdabot-irc-plugins /d' \

39 -e '/ language-nix /d' \

38 -e '/ language-nix /d' \

40 -e '/ shake /d' \

39 -e '/ shake /d' \

41 -e '/ ShellCheck /d' \

40 -e '/ ShellCheck /d' \

@@ -45,7 +44,7 @@ sed -r \

46# Drop the previous configuration ...

45# Drop the previous configuration ...

47# shellcheck disable=SC1004

46# shellcheck disable=SC1004

48−sed -e '/# LTS Haskell/,/^$/c \TODO\

47+sed -e '/ # LTS Haskell/,/^$/c \TODO\

49' -i nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml

48' -i nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml

51# ... and replace it with the new one.

50# ... and replace it with the new one.