c92811b...master · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

.travis.yml+131−86

since splitsnapshots

@@ -1,116 +1,161 @@

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

3−# runghc make_travis_yml_2.hs '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '--hlint' '-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.9.20200306

8+#

9+version: ~> 1.0

7language: c

10language: c

8−sudo: false

11+os: linux

9−

12+dist: xenial

10git:

13git:

11− submodules: false # whether to recursively clone submodules

14+ # whether to recursively clone submodules

12−

15+ submodules: false

13cache:

16cache:

14 directories:

17 directories:

15 - $HOME/.cabal/packages

18 - $HOME/.cabal/packages

16 - $HOME/.cabal/store

19 - $HOME/.cabal/store

17−

20+ - $HOME/.hlint

18before_cache:

21before_cache:

19− - rm -fv $HOME/.cabal/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'

21− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*

24+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*

22− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json

25+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json

23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache

26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache

24− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

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

25− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

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

26−

27− - rm -rfv $HOME/.cabal/packages/head.hackage

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

28−

30+jobs:

29−matrix:

30 include:

31 include:

31− - compiler: "ghc-8.6.3"

32+ - compiler: ghc-8.10.1

32− # env: TEST=--disable-tests BENCH=--disable-benchmarks

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"]}}

33− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}

34+ os: linux

34− - compiler: "ghc-8.4.4"

35+ - compiler: ghc-8.8.3

35− # env: TEST=--disable-tests BENCH=--disable-benchmarks

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"]}}

36− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}

37+ os: linux

37−

38+ - compiler: ghc-8.6.5

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

38before_install:

44before_install:

39− - HC=${CC}

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

46+ - WITHCOMPILER="-w $HC"

47+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')

40− - HCPKG=${HC/ghc/ghc-pkg}

48+ - HCPKG="$HC-pkg"

41 - unset CC

49 - unset CC

42− - ROOTDIR=$(pwd)

50+ - CABAL=/opt/ghc/bin/cabal

43− - mkdir -p $HOME/.local/bin

51+ - CABALHOME=$HOME/.cabal

44− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"

52+ - export PATH="$CABALHOME/bin:$PATH"

53+ - TOP=$(pwd)

45− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

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

46 - echo $HCNUMVER

55 - echo $HCNUMVER

47−

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

57+ - set -o pipefail

58+ - TEST=--enable-tests

59+ - BENCH=--enable-benchmarks

60+ - HEADHACKAGE=false

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

62+ - rm -f $CABALHOME/config

63+ - |

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

65+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config

66+ echo "write-ghc-environment-files: always" >> $CABALHOME/config

67+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config

68+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config

69+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config

70+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

71+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

72+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config

73+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

74+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

75+ echo "install-dirs user" >> $CABALHOME/config

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

77+ echo "repository 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

48install:

90install:

49− - cabal --version

91+ - ${CABAL} --version

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

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

51− - BENCH=${BENCH---enable-benchmarks}

93+ - |

52− - TEST=${TEST---enable-tests}

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

53− - HADDOCK=${HADDOCK-true}

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

54− - UNCONSTRAINED=${UNCONSTRAINED-true}

96+ - cat $CABALHOME/config

55− - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}

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

56− - GHCHEAD=${GHCHEAD-false}

57− - travis_retry cabal update -v

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

58− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"

59− - rm -fv cabal.project cabal.project.local

60− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

61− - (cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)

62− - if [ $HCNUMVER -ge 80000 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin doctest --constraint='doctest ==0.16.*'; fi

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

63− - if [ $HCNUMVER -eq 80603 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; 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

64− - "printf 'packages: \".\"\\n' > cabal.project"

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"

65− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"

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

104+ # Generate cabal.project

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

66− - touch cabal.project.local

106+ - touch cabal.project

107+ - |

108+ echo "packages: ." >> cabal.project

109+ - |

67− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- cabal2nix | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

110+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(Cabal|cabal2nix)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

68 - cat cabal.project || true

111 - cat cabal.project || true

69 - cat cabal.project.local || true

112 - cat cabal.project.local || true

70− - if [ -f "./configure.ac" ]; then

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

71− (cd "." && autoreconf -i);

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

72− fi

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

73− - rm -f cabal.project.freeze

116+ - rm cabal.project.freeze

74− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all

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

75− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all

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

76− - rm -rf .ghc.environment.* "."/dist

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

78−

79−# Here starts the actual work to be performed for the package under test;

80−# any command which exits with a non-zero exit code causes the build to fail.

81script:

119script:

82− # test that source-distributions can be generated

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

121+ # Packaging...

83− - cabal new-sdist all

122+ - ${CABAL} v2-sdist all

123+ # Unpacking...

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

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

85 - cd ${DISTDIR} || false

125 - cd ${DISTDIR} || false

86− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

126+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;

87− - "printf 'packages: cabal2nix-*/*.cabal\\n' > cabal.project"

127+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

88− - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"

128+ - PKGDIR_cabal2nix="$(find . -maxdepth 1 -type d -regex '.*/cabal2nix-[0-9.]*')"

89− - touch cabal.project.local

129+ # Generate cabal.project

130+ - rm -rf cabal.project cabal.project.local cabal.project.freeze

131+ - touch cabal.project

132+ - |

133+ echo "packages: ${PKGDIR_cabal2nix}" >> cabal.project

134+ - |

90− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- cabal2nix | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"

135+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(Cabal|cabal2nix)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

91 - cat cabal.project || true

136 - cat cabal.project || true

92 - cat cabal.project.local || true

137 - cat cabal.project.local || true

138+ # Building...

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

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

94− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

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

95−

141+ # Building with tests and benchmarks...

96 # build & run tests, build benchmarks

142 # build & run tests, build benchmarks

97− - cabal new-build -w ${HC} ${TEST} ${BENCH} all

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

98− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi

144+ # Testing...

99−

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

100− # doctest

146+ # Doctest...

101− - if [ $HCNUMVER -ge 80000 ]; then (cd cabal2nix-* && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XMonadFailDesugaring src); fi

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

102−

148+ # HLint..

103− # hlint

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

104− - if [ $HCNUMVER -eq 80603 ]; then (cd cabal2nix-* && hlint -XMonadFailDesugaring src); fi

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

105−

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

106− # cabal check

152+ # cabal check...

107− - (cd cabal2nix-* && cabal check)

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

108−

109− # haddock

154+ # haddock...

110− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

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

111−

112− # Build without installed constraints for packages in global-db

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

113− - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi

157+ - rm -f cabal.project.local

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

114

159

115−# REGENDATA ["--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--hlint","-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"])

116# EOF

161# EOF

README.md+7−7

@@ -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

34−http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure.

34+https://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+28−79

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

1name: cabal2nix

2−version: 2.14.1

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

@@ -8,73 +8,26 @@ description:

8 > nix-env -i cabal2nix

9license: BSD3

10license-file: LICENSE

11−author: Peter Simons,

11+author: Peter Simons, Andres Loeh, Benno Fünfstück, Mateusz Kowalczyk,

12− Andres Loeh,

13− Benno Fünfstück,

14− Mateusz Kowalczyk,

15− Michael Alan Dorman,

12+ Michael Alan Dorman, Tom Smalley, Mathijs Kwik, Shea Levy, Dmitry

16− Tom Smalley,

17− Mathijs Kwik,

18− Shea Levy,

19− Dmitry Malikov,

20− Eric Seidel,

21− Jacob Mitchell,

22− Graham Christensen,

13+ Malikov, Eric Seidel, Jacob Mitchell, Graham Christensen,

23− Hamish Mackenzie,

14+ Hamish Mackenzie, Nikolay Amiantov, Aycan iRiCAN, Bryan

24− Nikolay Amiantov,

25− Aycan iRiCAN,

26− Bryan Gardiner,

27− Joe Hermaszewski,

15+ Gardiner, Joe Hermaszewski, John Wiegley, Philipp Hausmann,

28− John Wiegley,

29− Philipp Hausmann,

30− Spencer Janssen,

16+ Spencer Janssen, Tom Hunger, William Casarin, koral,

31− Tom Hunger,

32− William Casarin,

33− koral,

34− ksaric,

35− Adam Vogt,

36− Alexey Shmalko,

17+ ksaric, Adam Vogt, Alexey Shmalko, Corey O'Connor, Cray

37− Corey O'Connor,

38− Cray Elliott,

39− David Johnson,

18+ Elliott, David Johnson, Dmitry Bushev, Domen Kožar, Felix

40− Dmitry Bushev,

41− Domen Kožar,

42− Felix Kunzmann,

43− Gabriel Ebner,

44− Gergely Risko,

45− Joachim Fasting,

19+ Kunzmann, Gabriel Ebner, Gergely Risko, Joachim Fasting,

46− John Albietz,

47− John Chee,

48− Jussi Maki,

49− Lisanna Dettwyler,

20+ John Albietz, John Chee, Jussi Maki, Lisanna Dettwyler,

50− Mark Laws,

51− Mark Wotton,

52− Matthew Pickering,

21+ Mark Laws, Mark Wotton, Matthew Pickering, Matthew Stewart,

53− Matthew Stewart,

54− Matvey Aksenov,

55− Nicholas Clarke,

22+ Matvey Aksenov, Nicholas Clarke, Nicolas Rolland, Oliver

56− Nicolas Rolland,

57− Oliver Charles,

58− Pascal Wittmann,

59− Patrick John Wheeler,

23+ Charles, Pascal Wittmann, Patrick John Wheeler, Phil de

60− Phil de Joux,

61− Piotr Bogdan,

62− Profpatsch,

63− Raymond Gauthier,

24+ Joux, Piotr Bogdan, Profpatsch, Raymond Gauthier, Renzo

64− Renzo Carbonara,

65− Rodney Lorrimar,

25+ Carbonara, Rodney Lorrimar, Sibi, Sukant Hajra, Tanner

66− Sibi,

67− Sukant Hajra,

68− Tanner Doshier,

69− Vaibhav Sagar,

70− Viktar Basharymau,

26+ Doshier, Vaibhav Sagar, Viktar Basharymau, danbst, karsten

71− danbst,

72− karsten gebbert,

73− laMudri,

74− Александр Цамутали

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

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

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

76stability: stable

29stability: stable

77−tested-with: GHC == 8.4.4, GHC == 8.6.3

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

78category: Distribution, Nix

31category: Distribution, Nix

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

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

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

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

@@ -107,15 +60,15 @@ library

107 Distribution.Nixpkgs.Haskell.PackageSourceSpec

60 Distribution.Nixpkgs.Haskell.PackageSourceSpec

108 other-modules: Paths_cabal2nix

61 other-modules: Paths_cabal2nix

109 hs-source-dirs: src

62 hs-source-dirs: src

110− build-depends: base < 5

63+ build-depends: base > 4.11

111− , Cabal > 2.2

64+ , Cabal == 3.0.*

112− , aeson

65+ , aeson > 1

113 , ansi-wl-pprint

66 , ansi-wl-pprint

114 , bytestring

67 , bytestring

115− , containers

68+ , containers >= 0.5.9

116 , deepseq >= 1.4

69 , deepseq >= 1.4

117 , directory

70 , directory

118− , distribution-nixpkgs >= 1.1.1

71+ , distribution-nixpkgs >= 1.3.1

119 , filepath

72 , filepath

120 , hackage-db >= 2.0.1

73 , hackage-db >= 2.0.1

121 , hopenssl >= 2

74 , hopenssl >= 2

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

131 , transformers

84 , transformers

132 , yaml

85 , yaml

133 default-language: Haskell2010

86 default-language: Haskell2010

134− default-extensions: MonadFailDesugaring

135 other-extensions: MultiParamTypeClasses

87 other-extensions: MultiParamTypeClasses

136 ScopedTypeVariables

88 ScopedTypeVariables

137 FlexibleInstances

89 FlexibleInstances

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

149 hs-source-dirs: cabal2nix

101 hs-source-dirs: cabal2nix

150 build-depends: base, cabal2nix

102 build-depends: base, cabal2nix

151 default-language: Haskell2010

103 default-language: Haskell2010

152− default-extensions: MonadFailDesugaring

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

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

154 -Wredundant-constraints

105 -Wredundant-constraints

155

106

@@ -159,13 +110,13 @@ executable hackage2nix

159 Paths_cabal2nix

110 Paths_cabal2nix

160 hs-source-dirs: hackage2nix

111 hs-source-dirs: hackage2nix

161 build-depends: base < 5

112 build-depends: base < 5

162− , Cabal > 2.2

113+ , Cabal

163 , aeson

114 , aeson

164 , bytestring

115 , bytestring

165 , cabal2nix

116 , cabal2nix

166 , containers

117 , containers

167 , directory

118 , directory

168− , distribution-nixpkgs >= 1.1.1

119+ , distribution-nixpkgs >= 1.2

169 , filepath

120 , filepath

170 , hopenssl >= 2

121 , hopenssl >= 2

171 , language-nix

122 , language-nix

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

176 , optparse-applicative

127 , optparse-applicative

177 , pretty >= 1.1.2

128 , pretty >= 1.1.2

178 default-language: Haskell2010

129 default-language: Haskell2010

179− default-extensions: MonadFailDesugaring

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

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

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

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

182

132

183test-suite regression-test

133test-suite regression-test

184 type: exitcode-stdio-1.0

134 type: exitcode-stdio-1.0

185 main-is: Main.hs

135 main-is: Main.hs

186 hs-source-dirs: test

136 hs-source-dirs: test

187 build-depends: base

137 build-depends: base

188− , Cabal > 2.2

138+ , Cabal

189 , cabal2nix

139 , cabal2nix

190 , containers

140 , containers

191 , directory

141 , directory

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

197 , tasty

147 , tasty

198 , tasty-golden

148 , tasty-golden

199 default-language: Haskell2010

149 default-language: Haskell2010

200− default-extensions: MonadFailDesugaring

201 build-tools: cabal2nix

150 build-tools: cabal2nix

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

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

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

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

hackage2nix/Main.hs+24−18

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

1{-# LANGUAGE OverloadedStrings #-}

2{-# LANGUAGE RecordWildCards #-}

3−{-# LANGUAGE CPP #-}

5module Main ( main ) where

4module Main ( main ) where

@@ -11,13 +10,10 @@ import Control.Monad

11import Control.Monad.Par.Combinator

10import Control.Monad.Par.Combinator

12import Control.Monad.Par.IO

11import Control.Monad.Par.IO

13import Control.Monad.Trans ( liftIO )

12import Control.Monad.Trans ( liftIO )

14−import Data.List

13+import Data.List ( intercalate )

15import Data.Map.Strict ( Map )

14import Data.Map.Strict ( Map )

16import qualified Data.Map.Strict as Map

15import qualified Data.Map.Strict as Map

17import Data.Maybe

16import Data.Maybe

18−#if !MIN_VERSION_base(4,11,0)

19−import Data.Monoid

20−#endif

21import Data.Set ( Set )

17import Data.Set ( Set )

22import qualified Data.Set as Set

18import qualified Data.Set as Set

23import Data.String

19import Data.String

@@ -27,10 +23,11 @@ import Distribution.Nixpkgs.Haskell.Constraint

27import Distribution.Nixpkgs.Haskell.FromCabal

23import Distribution.Nixpkgs.Haskell.FromCabal

28import Distribution.Nixpkgs.Haskell.FromCabal.Configuration as Config

24import Distribution.Nixpkgs.Haskell.FromCabal.Configuration as Config

29import Distribution.Nixpkgs.Haskell.FromCabal.Flags

25import Distribution.Nixpkgs.Haskell.FromCabal.Flags

26+import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

30import Distribution.Nixpkgs.Meta

27import Distribution.Nixpkgs.Meta

31import Distribution.Nixpkgs.PackageMap

28import Distribution.Nixpkgs.PackageMap

32import Distribution.Package

29import Distribution.Package

33−import Distribution.PackageDescription hiding ( options, buildDepends, extraLibs, buildTools, homepage )

30+import Distribution.PackageDescription hiding ( options, extraLibs, buildTools, homepage )

34import Distribution.System

31import Distribution.System

35import Distribution.Text

32import Distribution.Text

36import Distribution.Version

33import Distribution.Version

@@ -66,7 +63,7 @@ main = do

66 pinfo :: ParserInfo CLI

63 pinfo :: ParserInfo CLI

67 pinfo = info

64 pinfo = info

68 ( helper

65 ( helper

69− <*> infoOption ("hackage2nix " ++ display Main.version) (long "version" <> help "Show version number")

66+ <*> infoOption ("hackage2nix " ++ prettyShow Main.version) (long "version" <> help "Show version number")

70 <*> cliOptions

67 <*> cliOptions

71 )

68 )

72 ( fullDesc

69 ( fullDesc

@@ -75,13 +72,15 @@ main = do

75 CLI {..} <- execParser pinfo

72 CLI {..} <- execParser pinfo

77 config <- readConfiguration (nixpkgsRepository </> configFile)

74 config <- readConfiguration (nixpkgsRepository </> configFile)

78− nixpkgs <- readNixpkgPackageMap nixpkgsRepository Nothing

75+ nixpkgs <- readNixpkgPackageMap ["-f", nixpkgsRepository, "--arg", "config", "{ allowAliases = false; }"]

79 preferredVersions <- readPreferredVersions (fromMaybe (hackageRepository </> "preferred-versions") preferredVersionsFile)

76 preferredVersions <- readPreferredVersions (fromMaybe (hackageRepository </> "preferred-versions") preferredVersionsFile)

80 let fixup = Map.delete "acme-everything" -- TODO: https://github.com/NixOS/cabal2nix/issues/164

77 let fixup = Map.delete "acme-everything" -- TODO: https://github.com/NixOS/cabal2nix/issues/164

81 . Map.delete "som" -- TODO: https://github.com/NixOS/cabal2nix/issues/164

78 . Map.delete "som" -- TODO: https://github.com/NixOS/cabal2nix/issues/164

82 . Map.delete "type" -- TODO: https://github.com/NixOS/cabal2nix/issues/163

79 . Map.delete "type" -- TODO: https://github.com/NixOS/cabal2nix/issues/163

83 . Map.delete "control-invariants" -- TODO: depends on "assert"

80 . Map.delete "control-invariants" -- TODO: depends on "assert"

81+ . Map.delete "with" -- TODO: https://github.com/NixOS/cabal2nix/issues/164

82+ . Map.delete "telega" -- TODO: depends on "with"

84− . over (at ("hermes")) ((fmap (set (contains "1.3.4.3") False))) -- TODO: https://github.com/haskell/hackage-server/issues/436

83+ . over (at "hermes") (fmap (set (contains "1.3.4.3") False)) -- TODO: https://github.com/haskell/hackage-server/issues/436

85 hackage <- fixup <$> readHackage hackageRepository

84 hackage <- fixup <$> readHackage hackageRepository

86 let

85 let

87 hackagePackagesFile :: FilePath

86 hackagePackagesFile :: FilePath

@@ -94,7 +93,7 @@ main = do

94 latestVersionSet = Map.map Set.findMax (Map.filter (not . Set.null) (Map.mapWithKey (enforcePreferredVersions preferredVersions) hackage))

93 latestVersionSet = Map.map Set.findMax (Map.filter (not . Set.null) (Map.mapWithKey (enforcePreferredVersions preferredVersions) hackage))

96 defaultPackageOverridesSet :: PackageSet

95 defaultPackageOverridesSet :: PackageSet

97− defaultPackageOverridesSet = Map.fromList [ (name, resolveConstraint c hackage) | c@(Dependency name _) <- defaultPackageOverrides config ]

96+ defaultPackageOverridesSet = Map.fromList [ (name, resolveConstraint c hackage) | c@(Dependency name _ _) <- defaultPackageOverrides config ]

99 generatedDefaultPackageSet :: PackageSet

98 generatedDefaultPackageSet :: PackageSet

100 generatedDefaultPackageSet = (defaultPackageOverridesSet `Map.union` latestVersionSet) `Map.difference` corePackageSet

99 generatedDefaultPackageSet = (defaultPackageOverridesSet `Map.union` latestVersionSet) `Map.difference` corePackageSet

@@ -107,7 +106,7 @@ main = do

107

106

108 extraPackageSet :: PackageMultiSet

107 extraPackageSet :: PackageMultiSet

109 extraPackageSet = Map.unionsWith Set.union

108 extraPackageSet = Map.unionsWith Set.union

110− [ Map.singleton name (Set.singleton (resolveConstraint c hackage)) | c@(Dependency name _) <- extraPackages config ]

109+ [ Map.singleton name (Set.singleton (resolveConstraint c hackage)) | c@(Dependency name _ _) <- extraPackages config ]

111

110

112 db :: PackageMultiSet

111 db :: PackageMultiSet

113 db = Map.unionsWith Set.union [ Map.map Set.singleton generatedDefaultPackageSet

112 db = Map.unionsWith Set.union [ Map.map Set.singleton generatedDefaultPackageSet

@@ -117,7 +116,7 @@ main = do

117 ]

116 ]

118

117

119 haskellResolver :: Dependency -> Bool

118 haskellResolver :: Dependency -> Bool

120− haskellResolver (Dependency name vrange)

119+ haskellResolver (Dependency name vrange _)

121 | Just v <- Map.lookup name corePackageSet = v `withinRange` vrange

120 | Just v <- Map.lookup name corePackageSet = v `withinRange` vrange

122 | Just v <- Map.lookup name generatedDefaultPackageSet = v `withinRange` vrange

121 | Just v <- Map.lookup name generatedDefaultPackageSet = v `withinRange` vrange

123 | otherwise = False

122 | otherwise = False

@@ -136,8 +135,13 @@ main = do

136 (descr, cabalSHA256) <- readPackage hackageRepository pkgId

135 (descr, cabalSHA256) <- readPackage hackageRepository pkgId

137 meta <- readPackageMeta hackageRepository pkgId

136 meta <- readPackageMeta hackageRepository pkgId

138

137

139− let isInDefaultPackageSet :: Bool

138+ let isInDefaultPackageSet, isHydraEnabled, isBroken :: Bool

140− isInDefaultPackageSet = maybe False (== v) (Map.lookup name generatedDefaultPackageSet)

139+ isInDefaultPackageSet = (== Just v) (Map.lookup name generatedDefaultPackageSet)

140+ isHydraEnabled = isInDefaultPackageSet && not (isBroken || name `Set.member` dontDistributePackages config)

141+ isBroken = any (withinRange v) [ vr | Dependency pn vr _ <- brokenPackages config, pn == name ]

142+

143+ droppedPlatforms :: Set Platform

144+ droppedPlatforms = Map.findWithDefault mempty name (unsupportedPlatforms config)

141

145

142 tarballSHA256 :: SHA256Hash

146 tarballSHA256 :: SHA256Hash

143 tarballSHA256 = fromMaybe (error (display pkgId ++ ": meta data has no hash for the tarball"))

147 tarballSHA256 = fromMaybe (error (display pkgId ++ ": meta data has no hash for the tarball"))

@@ -153,13 +157,15 @@ main = do

153 drv = fromGenericPackageDescription haskellResolver nixpkgsResolver targetPlatform (compilerInfo config) flagAssignment [] descr

157 drv = fromGenericPackageDescription haskellResolver nixpkgsResolver targetPlatform (compilerInfo config) flagAssignment [] descr

154 & src .~ urlDerivationSource ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") tarballSHA256

158 & src .~ urlDerivationSource ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") tarballSHA256

155 & editedCabalFile .~ cabalSHA256

159 & editedCabalFile .~ cabalSHA256

156− & metaSection.hydraPlatforms %~ (`Set.difference` Map.findWithDefault Set.empty name (dontDistributePackages config))

160+ & metaSection.platforms %~ (`Set.difference` Map.findWithDefault Set.empty name (unsupportedPlatforms config))

161+ & metaSection.hydraPlatforms %~ (if Set.null droppedPlatforms then id else (`Set.difference` droppedPlatforms))

162+ & metaSection.hydraPlatforms %~ (if isHydraEnabled then id else const Set.empty)

163+ & metaSection.broken ||~ isBroken

157 & metaSection.maintainers .~ Map.findWithDefault Set.empty name globalPackageMaintainers

164 & metaSection.maintainers .~ Map.findWithDefault Set.empty name globalPackageMaintainers

158− & metaSection.hydraPlatforms %~ (if isInDefaultPackageSet then id else const Set.empty)

159 & metaSection.homepage .~ ""

165 & metaSection.homepage .~ ""

160

166

161 overrides :: Doc

167 overrides :: Doc

162− overrides = fcat $ punctuate space [ disp b <> semi | b <- Set.toList ((view (dependencies . each) drv) `Set.union` view extraFunctionArgs drv), not (isFromHackage b) ]

168+ overrides = fcat $ punctuate space [ pPrint b <> semi | b <- Set.toList (view (dependencies . each) drv `Set.union` view extraFunctionArgs drv), not (isFromHackage b) ]

163 return $ render $ nest 2 $

169 return $ render $ nest 2 $

164 hang (doubleQuotes (text attr) <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)

170 hang (doubleQuotes (text attr) <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)

165

171

@@ -199,7 +205,7 @@ resolveConstraint c = fromMaybe (error msg) . resolveConstraint' c

199 ]

205 ]

200

206

201resolveConstraint' :: Constraint -> Hackage -> Maybe Version

207resolveConstraint' :: Constraint -> Hackage -> Maybe Version

202−resolveConstraint' (Dependency name vrange) hackage

208+resolveConstraint' (Dependency name vrange _) hackage

203 | Just vset' <- Map.lookup name hackage

209 | Just vset' <- Map.lookup name hackage

204 , vset <- Set.filter (`withinRange` vrange) vset'

210 , vset <- Set.filter (`withinRange` vrange) vset'

205 , not (Set.null vset) = Just (Set.findMax vset)

211 , not (Set.null vset) = Just (Set.findMax vset)

hackage2nix/README.md+3

@@ -15,6 +15,9 @@ and we want to check that hackage-packages.nix will be updated correctly.

15On macOS you can use [this](https://gist.github.com/dixson3/8360571) to create one

16(you can replace 60g with 4g as that should be plenty).

18+There is a [video on YouTube](https://www.youtube.com/watch?v=qX0mgtSm360)

19+that gives a thorough walk-through of these steps.

20+

18#### Setup

21#### Setup

19Replace `git@github.com:NixOS/nixpkgs.git` with a fork you have access to.

22Replace `git@github.com:NixOS/nixpkgs.git` with a fork you have access to.

20```

23```

src/Cabal2nix.hs+11−13

@@ -11,14 +11,12 @@ 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

21−import qualified Distribution.Compat.ReadP as P

22import Distribution.Compiler

20import Distribution.Compiler

23import Distribution.Nixpkgs.Fetch

21import Distribution.Nixpkgs.Fetch

24import Distribution.Nixpkgs.Haskell

22import Distribution.Nixpkgs.Haskell

@@ -26,13 +24,14 @@ import Distribution.Nixpkgs.Haskell.FromCabal

26import Distribution.Nixpkgs.Haskell.FromCabal.Flags

24import Distribution.Nixpkgs.Haskell.FromCabal.Flags

27import qualified Distribution.Nixpkgs.Haskell.FromCabal.PostProcess as PP (pkg)

25import qualified Distribution.Nixpkgs.Haskell.FromCabal.PostProcess as PP (pkg)

28import qualified Distribution.Nixpkgs.Haskell.Hackage as DB

26import qualified Distribution.Nixpkgs.Haskell.Hackage as DB

27+import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

29import Distribution.Nixpkgs.Haskell.PackageSourceSpec

28import Distribution.Nixpkgs.Haskell.PackageSourceSpec

30import Distribution.Nixpkgs.Meta

29import Distribution.Nixpkgs.Meta

31−import Distribution.PackageDescription ( mkFlagName, mkFlagAssignment, FlagAssignment )

32import Distribution.Package ( packageId )

30import Distribution.Package ( packageId )

31+import Distribution.PackageDescription ( mkFlagName, mkFlagAssignment, FlagAssignment )

32+import Distribution.Parsec as P

33import Distribution.Simple.Utils ( lowercase )

34import Distribution.System

35−import Distribution.Text

36import Language.Nix

35import Language.Nix

37import Options.Applicative

36import Options.Applicative

38import Paths_cabal2nix ( version )

37import Paths_cabal2nix ( version )

@@ -94,8 +93,8 @@ options = Options

94 <*> optional (strOption $ long "hackage-db" <> metavar "PATH" <> help "path to the local hackage db in tar format")

93 <*> optional (strOption $ long "hackage-db" <> metavar "PATH" <> help "path to the local hackage db in tar format")

95 <*> switch (long "shell" <> help "generate output suitable for nix-shell")

94 <*> switch (long "shell" <> help "generate output suitable for nix-shell")

96 <*> many (strOption $ short 'f' <> long "flag" <> help "Cabal flag (may be specified multiple times)")

95 <*> many (strOption $ short 'f' <> long "flag" <> help "Cabal flag (may be specified multiple times)")

97− <*> option (readP parse) (long "compiler" <> help "compiler to use when evaluating the Cabal file" <> value buildCompilerId <> showDefaultWith display)

96+ <*> option parseCabal (long "compiler" <> help "compiler to use when evaluating the Cabal file" <> value buildCompilerId <> showDefaultWith prettyShow)

98− <*> option (maybeReader parsePlatform) (long "system" <> help "host system (in either short Nix format or full LLVM style) to use when evaluating the Cabal file" <> value buildPlatform <> showDefaultWith display)

97+ <*> option (maybeReader parsePlatform) (long "system" <> help "host system (in either short Nix format or full LLVM style) to use when evaluating the Cabal file" <> value buildPlatform <> showDefaultWith prettyShow)

99 <*> optional (strOption $ long "subpath" <> metavar "PATH" <> help "Path to Cabal file's directory relative to the URI (default is root directory)")

98 <*> optional (strOption $ long "subpath" <> metavar "PATH" <> help "Path to Cabal file's directory relative to the URI (default is root directory)")

100 <*> optional (option utcTimeReader (long "hackage-snapshot" <> help "hackage snapshot time, ISO format"))

99 <*> optional (option utcTimeReader (long "hackage-snapshot" <> help "hackage snapshot time, ISO format"))

101 <*> pure (\i -> Just (binding # (i, path # [ident # "pkgs", i])))

100 <*> pure (\i -> Just (binding # (i, path # [ident # "pkgs", i])))

@@ -110,10 +109,8 @@ utcTimeReader = eitherReader $ \arg ->

110 Nothing -> Left $ "Cannot parse date, ISO format used ('2017-11-20T12:18:35Z'): " ++ arg

109 Nothing -> Left $ "Cannot parse date, ISO format used ('2017-11-20T12:18:35Z'): " ++ arg

111 Just utcTime -> Right utcTime

110 Just utcTime -> Right utcTime

112

111

113−readP :: P.ReadP a a -> ReadM a

112+parseCabal :: Parsec a => ReadM a

114−readP p = eitherReader $ \s -> case [ r' | (r',"") <- P.readP_to_S p s ] of

113+parseCabal = eitherReader eitherParsec

115− (r:_) -> Right r

116− _ -> Left ("invalid value " ++ show s)

117

114

118-- | Replicate the normalization performed by GHC_CONVERT_CPU in GHC's aclocal.m4

115-- | Replicate the normalization performed by GHC_CONVERT_CPU in GHC's aclocal.m4

119-- since the output of that is what Cabal parses.

116-- since the output of that is what Cabal parses.

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

138 "watchos" -> "ios"

135 "watchos" -> "ios"

139 "tvos" -> "ios"

136 "tvos" -> "ios"

140 "linux-android" -> "linux-android"

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

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

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

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

142 _ -> fromMaybe os $ listToMaybe

140 _ -> fromMaybe os $ listToMaybe

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

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

@@ -164,7 +162,7 @@ parsePlatformParts = \case

164pinfo :: ParserInfo Options

162pinfo :: ParserInfo Options

165pinfo = info

163pinfo = info

166 ( helper

164 ( helper

167− <*> infoOption ("cabal2nix " ++ display version) (long "version" <> help "Show version number")

165+ <*> infoOption ("cabal2nix " ++ prettyShow version) (long "version" <> help "Show version number")

168 <*> options

166 <*> options

169 )

167 )

170 ( fullDesc

168 ( fullDesc

@@ -193,7 +191,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() ->

193 cabal2nix =<< getArgs

191 cabal2nix =<< getArgs

194

192

195hpackOverrides :: Derivation -> Derivation

193hpackOverrides :: Derivation -> Derivation

196−hpackOverrides = over phaseOverrides (++ "preConfigure = \"hpack\";")

194+hpackOverrides = over phaseOverrides (++ "prePatch = \"hpack\";")

197 . set (libraryDepends . tool . contains (PP.pkg "hpack")) True

195 . set (libraryDepends . tool . contains (PP.pkg "hpack")) True

198

196

199cabal2nix' :: Options -> IO (Either Doc Derivation)

197cabal2nix' :: Options -> IO (Either Doc Derivation)

src/Distribution/Nixpkgs/Fetch.hs+3−1

@@ -161,7 +161,9 @@ fetchWith (supportsRev, kind, addArgs) source = do

161 ExitFailure _ -> return Nothing

162 ExitSuccess -> do

163 buf <- BS.hGetContents stdoutH

164− let (l:ls) = reverse (BS.lines buf)

164+ let (l,ls) = case reverse (BS.lines buf) of

165+ [] -> error "This can't happen, but GHC doesn't know that."

166+ (x:xs) -> (x,xs)

165 buf' = BS.unlines (reverse ls)

167 buf' = BS.unlines (reverse ls)

166 case length ls of

168 case length ls of

167 0 -> return Nothing

169 0 -> return Nothing

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

@@ -9,7 +9,7 @@ import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

9type Constraint = Dependency

11satisfiesConstraint :: PackageIdentifier -> Constraint -> Bool

12−satisfiesConstraint (PackageIdentifier pn v) (Dependency cn vr) = (pn /= cn) || (v `withinRange` vr)

12+satisfiesConstraint (PackageIdentifier pn v) (Dependency cn vr _) = (pn /= cn) || (v `withinRange` vr)

14satisfiesConstraints :: PackageIdentifier -> [Constraint] -> Bool

15satisfiesConstraints p = all (satisfiesConstraint p)

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

@@ -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

@@ -112,8 +112,8 @@ instance Pretty Derivation where

112 pPrint drv@MkDerivation {..} = funargs (map text ("mkDerivation" : toAscList inputs)) $$ vcat

113 [ text "mkDerivation" <+> lbrace

114 , nest 2 $ vcat

115− [ attr "pname" $ doubleQuotes $ disp (packageName _pkgid)

115+ [ attr "pname" $ doubleQuotes $ pPrint (packageName _pkgid)

116− , attr "version" $ doubleQuotes $ disp (packageVersion _pkgid)

116+ , attr "version" $ doubleQuotes $ pPrint (packageVersion _pkgid)

117 , pPrint _src

118 , onlyIf (_subpath /= ".") $ attr "postUnpack" postUnpack

119 , onlyIf (_revision > 0) $ attr "revision" $ doubleQuotes $ int _revision

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

@@ -58,14 +58,14 @@ finalizeGenericPackageDescription haskellResolver arch compiler flags constraint

58 }

60 jailbroken :: HaskellResolver -> HaskellResolver

61− jailbroken resolver (Dependency pkg _) = resolver (Dependency pkg anyVersion)

61+ jailbroken resolver (Dependency pkg _ _) = resolver (Dependency pkg anyVersion mempty)

63 withInternalLibs :: HaskellResolver -> HaskellResolver

64 withInternalLibs resolver d = depPkgName d `elem` internalNames || resolver d

66 internalNames :: [PackageName]

67 internalNames = [ unqualComponentNameToPackageName n | (n,_) <- condSubLibraries genDesc ]

68− ++ [ unqualComponentNameToPackageName n | Just n <- libName <$> subLibraries (packageDescription genDesc) ]

68+ ++ [ unqualComponentNameToPackageName n | LSubLibName n <- libName <$> subLibraries (packageDescription genDesc) ]

70 in case finalize (jailbroken (withInternalLibs haskellResolver)) of

71 Left m -> case finalize (const True) of

@@ -119,7 +119,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package

119 nixLicense = either fromSPDXLicense fromCabalLicense licenseRaw

120

121 resolveInHackage :: Identifier -> Binding

122− resolveInHackage i | (i^.ident) `elem` [ unPackageName n | (Dependency n _) <- missingDeps ] = bindNull i

122+ resolveInHackage i | (i^.ident) `elem` [ unPackageName n | (Dependency n _ _) <- missingDeps ] = bindNull i

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

124

125 -- TODO: This is all very confusing. Haskell packages refer to the Nixpkgs

@@ -136,19 +136,19 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package

136 resolveInNixpkgs :: Identifier -> Binding

137 resolveInNixpkgs i

138 | i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i]) -- TODO: evil!

139− | i == "gtk2" = binding # (i, path # ["pkgs","gnome2","gtk"])

139+ | i == "gtk2" = binding # (i, path # ["pkgs","gtk2"]) -- TODO: these cases should not be necessary

140− | i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])

140+ | i == "gtk3" = binding # (i, path # ["pkgs","gtk3"])

141− | i == "gtksourceview3" = binding # (i, path # ["pkgs","gnome3","gtksourceview"])

141+ | i == "gtksourceview3" = binding # (i, path # ["pkgs","gtksourceview3"])

142− | i == "vte_291" = binding # (i, path # ["pkgs","gnome3","vte"])

142+ | i == "vte_291" = binding # (i, path # ["pkgs","vte"])

143 | Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p

144 | otherwise = bindNull i

145

146 resolveInHackageThenNixpkgs :: Identifier -> Binding

147− resolveInHackageThenNixpkgs i | haskellResolver (Dependency (mkPackageName (i^.ident)) anyVersion) = resolveInHackage i

147+ resolveInHackageThenNixpkgs i | haskellResolver (Dependency (mkPackageName (i^.ident)) anyVersion mempty) = resolveInHackage i

148 | otherwise = resolveInNixpkgs i

149

150 internalLibNames :: [PackageName]

151− internalLibNames = fmap unqualComponentNameToPackageName . catMaybes $ libName <$> subLibraries

151+ internalLibNames = [ unqualComponentNameToPackageName n | LSubLibName n <- libName <$> subLibraries ]

152

153 doHaddockPhase :: Bool

154 doHaddockPhase | not (null internalLibNames) = False

@@ -158,7 +158,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package

158 convertBuildInfo :: Cabal.BuildInfo -> Nix.BuildInfo

159 convertBuildInfo Cabal.BuildInfo {..} | not buildable = mempty

160 convertBuildInfo Cabal.BuildInfo {..} = mempty

161− & haskell .~ Set.fromList [ resolveInHackage (toNixName x) | (Dependency x _) <- targetBuildDepends, x `notElem` internalLibNames ]

161+ & haskell .~ Set.fromList [ resolveInHackage (toNixName x) | (Dependency x _ _) <- targetBuildDepends, x `notElem` internalLibNames ]

162 & system .~ Set.fromList [ resolveInNixpkgs y | x <- extraLibs, y <- libNixName x ]

163 & pkgconfig .~ Set.fromList [ resolveInNixpkgs y | PkgconfigDependency x _ <- pkgconfigDepends, y <- libNixName (unPkgconfigName x) ]

164 & tool .~ Set.fromList (map resolveInHackageThenNixpkgs . concatMap buildToolNixName

@@ -166,7 +166,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package

166

167 convertSetupBuildInfo :: Cabal.SetupBuildInfo -> Nix.BuildInfo

168 convertSetupBuildInfo bi = mempty

169− & haskell .~ Set.fromList [ resolveInHackage (toNixName x) | (Dependency x _) <- Cabal.setupDepends bi ]

169+ & haskell .~ Set.fromList [ resolveInHackage (toNixName x) | (Dependency x _ _) <- Cabal.setupDepends bi ]

170

171bindNull :: Identifier -> Binding

172bindNull i = binding # (i, path # ["null"])

src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+28−32

@@ -1,16 +1,21 @@

1{-# LANGUAGE RecordWildCards #-}

2−{-# LANGUAGE CPP #-}

3{-# LANGUAGE FlexibleInstances #-}

2{-# LANGUAGE FlexibleInstances #-}

4{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE DeriveGeneric #-}

6{-# OPTIONS_GHC -fno-warn-orphans #-}

5{-# OPTIONS_GHC -fno-warn-orphans #-}

8−module Distribution.Nixpkgs.Haskell.FromCabal.Configuration ( Configuration(..), readConfiguration, assertConsistency ) where

7+module Distribution.Nixpkgs.Haskell.FromCabal.Configuration

8+ ( Configuration(..), readConfiguration, assertConsistency

9+ )

10+ where

11+

12+import Prelude hiding ( fail )

10−import Control.Exception ( throwIO )

11import Control.DeepSeq

14import Control.DeepSeq

15+import Control.Exception ( throwIO )

12import Control.Lens

16import Control.Lens

13−import Control.Monad

17+import Control.Monad hiding ( fail )

18+import Control.Monad.Fail

14import Data.Aeson

19import Data.Aeson

15import Data.Map as Map

20import Data.Map as Map

16import Data.Set as Set

21import Data.Set as Set

@@ -40,14 +45,22 @@ data Configuration = Configuration

40 -- role during dependency resolution.

45 -- role during dependency resolution.

41 , extraPackages :: [Constraint]

46 , extraPackages :: [Constraint]

43− -- |We know that these packages won't build, so we give them an empty

44− -- meta.hydraPlatforms attribute to avoid cluttering our Hydra output with

45− -- lots of failure messages.

46− , dontDistributePackages :: Map PackageName (Set Platform)

47−

48 -- |This information is used by the @hackage2nix@ utility to determine the

49 -- 'maintainers' for a given Haskell package.

50 , packageMaintainers :: Map Identifier (Set PackageName)

51+

52+ -- |These packages (by design) don't support certain platforms.

53+ , unsupportedPlatforms :: Map PackageName (Set Platform)

54+

55+ -- |These packages cannot be distributed by Hydra, i.e. because they have an

56+ -- unfree license or depend on other tools that cannot be distributed for

57+ -- some reason.

58+ , dontDistributePackages :: Set PackageName

59+

60+ -- |We know that these packages won't compile, so we mark them as broken and

61+ -- also disable their meta.hydraPlatforms attribute to avoid cluttering our

62+ -- Hydra job with lots of failure messages.

63+ , brokenPackages :: [Constraint]

51 }

64 }

52 deriving (Show, Generic)

65 deriving (Show, Generic)

@@ -59,50 +72,33 @@ instance FromJSON Configuration where

59 <*> o .:? "core-packages" .!= mempty

72 <*> o .:? "core-packages" .!= mempty

60 <*> o .:? "default-package-overrides" .!= mempty

73 <*> o .:? "default-package-overrides" .!= mempty

61 <*> o .:? "extra-packages" .!= mempty

74 <*> o .:? "extra-packages" .!= mempty

62− <*> o .:? "dont-distribute-packages" .!= mempty

63 <*> o .:? "package-maintainers" .!= mempty

75 <*> o .:? "package-maintainers" .!= mempty

76+ <*> o .:? "unsupported-platforms" .!= mempty

77+ <*> o .:? "dont-distribute-packages" .!= mempty

78+ <*> o .:? "broken-packages" .!= mempty

64 parseJSON _ = error "invalid Configuration"

79 parseJSON _ = error "invalid Configuration"

66instance FromJSON Identifier where

81instance FromJSON Identifier where

67 parseJSON (String s) = pure (review ident (T.unpack s))

82 parseJSON (String s) = pure (review ident (T.unpack s))

68 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Nix identifier")

83 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Nix identifier")

70−#if MIN_VERSION_aeson(1,0,0)

71−

72instance FromJSONKey Identifier where

85instance FromJSONKey Identifier where

73 fromJSONKey = FromJSONKeyText parseKey

86 fromJSONKey = FromJSONKeyText parseKey

75instance FromJSONKey PackageName where

88instance FromJSONKey PackageName where

76 fromJSONKey = FromJSONKeyText parseKey

89 fromJSONKey = FromJSONKeyText parseKey

78−#elif MIN_VERSION_aeson(0,11,0)

79−

80−instance (FromJSON v) => FromJSON (Map Identifier v) where

81− parseJSON = fmap (Map.mapKeys parseKey) . parseJSON

82−

83−instance (FromJSON v) => FromJSON (Map PackageName v) where

84− parseJSON = fmap (Map.mapKeys parseKey) . parseJSON

85−

86−#else

87−

88−instance (Ord k, FromJSON k, FromJSON v) => FromJSON (Map k v) where

89− parseJSON = fmap (Map.mapKeys parseKey) . parseJSON

90−

91−#endif

92−

93parseKey :: FromJSON k => Text -> k

91parseKey :: FromJSON k => Text -> k

94parseKey s = either error id (parseEither parseJSON (String s))

92parseKey s = either error id (parseEither parseJSON (String s))

96readConfiguration :: FilePath -> IO Configuration

94readConfiguration :: FilePath -> IO Configuration

97−readConfiguration path =

98− decodeFileEither path >>= either throwIO assertConsistency

95+readConfiguration path = decodeFileEither path >>= either throwIO assertConsistency

100−assertConsistency :: Monad m => Configuration -> m Configuration

97+assertConsistency :: MonadFail m => Configuration -> m Configuration

101assertConsistency cfg@Configuration {..} = do

98assertConsistency cfg@Configuration {..} = do

102 let report msg = fail ("*** configuration error: " ++ msg)

99 let report msg = fail ("*** configuration error: " ++ msg)

103−

104 maintainedPackages = Set.unions (Map.elems packageMaintainers)

100 maintainedPackages = Set.unions (Map.elems packageMaintainers)

105− disabledPackages = Map.keysSet dontDistributePackages

101+ disabledPackages = dontDistributePackages `Set.union` Set.fromList (depPkgName <$> brokenPackages)

106 disabledMaintainedPackages = maintainedPackages `Set.intersection` disabledPackages

102 disabledMaintainedPackages = maintainedPackages `Set.intersection` disabledPackages

107 unless (Set.null disabledMaintainedPackages) $

103 unless (Set.null disabledMaintainedPackages) $

108 report ("disabled packages that have a maintainer: " ++ show disabledMaintainedPackages)

104 report ("disabled packages that have a maintainer: " ++ show disabledMaintainedPackages)

src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+9−2

@@ -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,6 +28,7 @@ configureCabalFlags' (PackageIdentifier name version)

26 , enable "dbus"

28 , enable "dbus"

27 , disable "debuglocks"

29 , disable "debuglocks"

28 , enable "magicmime"

30 , enable "magicmime"

31+ , enable "networkbsd"

29 , enable "pairing"

32 , enable "pairing"

30 , enable "production"

33 , enable "production"

31 , enable "s3"

34 , enable "s3"

@@ -44,6 +47,7 @@ configureCabalFlags' (PackageIdentifier name version)

44 | name == "io-streams" = [enable "NoInteractiveTests"]

47 | name == "io-streams" = [enable "NoInteractiveTests"]

45 | name == "liquid-fixpoint" = [enable "build-external"]

48 | name == "liquid-fixpoint" = [enable "build-external"]

46 | name == "pandoc" = [enable "https", disable "trypandoc"]

49 | name == "pandoc" = [enable "https", disable "trypandoc"]

50+ | name == "pandoc-placetable" = [enable "inlineMarkdown"]

47 | name == "persistent-sqlite" = [enable "systemlib"]

51 | name == "persistent-sqlite" = [enable "systemlib"]

48 | name == "reactive-banana-wx" = [disable "buildExamples"]

52 | name == "reactive-banana-wx" = [disable "buildExamples"]

49 | name == "snap-server" = [enable "openssl"]

53 | name == "snap-server" = [enable "openssl"]

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

55 | otherwise = []

59 | otherwise = []

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

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

58−enable name = (mkFlagName name, True)

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

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

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

61−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+15−7

@@ -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"

@@ -47,7 +48,7 @@ libNixName "gconf" = return "GConf"

47libNixName "gconf-2.0" = return "GConf"

48libNixName "gconf-2.0" = return "GConf"

48libNixName "gdk-2.0" = return "gtk2"

49libNixName "gdk-2.0" = return "gtk2"

49libNixName "gdk-3.0" = return "gtk3"

50libNixName "gdk-3.0" = return "gtk3"

50−libNixName "gdk-pixbuf-2.0" = return "gdk_pixbuf"

51+libNixName "gdk-pixbuf-2.0" = return "gdk-pixbuf"

51libNixName "gdk-x11-2.0" = return "gdk_x11"

52libNixName "gdk-x11-2.0" = return "gdk_x11"

52libNixName "gdk-x11-3.0" = return "gtk3"

53libNixName "gdk-x11-3.0" = return "gtk3"

53libNixName "gio-2.0" = return "glib"

54libNixName "gio-2.0" = return "glib"

@@ -55,7 +56,7 @@ libNixName "GL" = return "libGL"

55libNixName "GLU" = ["libGLU","libGL"]

56libNixName "GLU" = ["libGLU","libGL"]

56libNixName "glut" = ["freeglut","libGLU","libGL"]

57libNixName "glut" = ["freeglut","libGLU","libGL"]

57libNixName "gnome-keyring" = return "gnome-keyring"

58libNixName "gnome-keyring" = return "gnome-keyring"

58−libNixName "gnome-keyring-1" = return "libgnome_keyring"

59+libNixName "gnome-keyring-1" = return "libgnome-keyring"

59libNixName "gnome-vfs-2.0" = return "gnome-vfs"

60libNixName "gnome-vfs-2.0" = return "gnome-vfs"

60libNixName "gnome-vfs-module-2.0" = return "gnome-vfs_module"

61libNixName "gnome-vfs-module-2.0" = return "gnome-vfs_module"

61libNixName "gobject-2.0" = return "glib"

62libNixName "gobject-2.0" = return "glib"

@@ -84,8 +85,8 @@ libNixName "ImageMagick" = return "imagemagick"

84libNixName "Imlib2" = return "imlib2"

85libNixName "Imlib2" = return "imlib2"

85libNixName "iw" = return "wirelesstools"

86libNixName "iw" = return "wirelesstools"

86libNixName "jack" = return "libjack2"

87libNixName "jack" = return "libjack2"

87−libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.

88+libNixName "javascriptcoregtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that.

88−libNixName "javascriptcoregtk-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.

89+libNixName "javascriptcoregtk-4.0" = return "webkitgtk"

89libNixName "jpeg" = return "libjpeg"

90libNixName "jpeg" = return "libjpeg"

90libNixName "jvm" = return "jdk"

91libNixName "jvm" = return "jdk"

91libNixName "lapack" = return "liblapack"

92libNixName "lapack" = return "liblapack"

@@ -94,6 +95,9 @@ 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"

100+libNixName "libqrencode" = return "qrencode"

97libNixName "libR" = return "R"

101libNixName "libR" = return "R"

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

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

99libNixName "libsystemd" = return "systemd"

103libNixName "libsystemd" = return "systemd"

@@ -104,9 +108,13 @@ libNixName "libzmq" = return "zeromq"

104libNixName "m" = [] -- in stdenv

108libNixName "m" = [] -- in stdenv

105libNixName "magic" = return "file"

109libNixName "magic" = return "file"

106libNixName "MagickWand" = return "imagemagick"

110libNixName "MagickWand" = return "imagemagick"

111+libNixName "mnl" = return "libmnl"

107libNixName "mpi" = return "openmpi"

112libNixName "mpi" = return "openmpi"

108libNixName "ncursesw" = return "ncurses"

113libNixName "ncursesw" = return "ncurses"

109libNixName "netsnmp" = return "net_snmp"

114libNixName "netsnmp" = return "net_snmp"

115+libNixName "nix-expr" = return "nix"

116+libNixName "nix-main" = return "nix"

117+libNixName "nix-store" = return "nix"

110libNixName "notify" = return "libnotify"

118libNixName "notify" = return "libnotify"

111libNixName "odbc" = return "unixODBC"

119libNixName "odbc" = return "unixODBC"

112libNixName "openblas" = return "openblasCompat"

120libNixName "openblas" = return "openblasCompat"

@@ -153,8 +161,9 @@ libNixName "wayland-client" = return "wayland"

153libNixName "wayland-cursor" = return "wayland"

161libNixName "wayland-cursor" = return "wayland"

154libNixName "wayland-egl" = return "libGL"

162libNixName "wayland-egl" = return "libGL"

155libNixName "wayland-server" = return "wayland"

163libNixName "wayland-server" = return "wayland"

156−libNixName "webkit2gtk-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.

164+libNixName "webkit2gtk" = return "webkitgtk"

165+libNixName "webkit2gtk-4.0" = return "webkitgtk"

157−libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk-web-extension" -- This package doesn't actually exist in nixpkgs at present.

166+libNixName "webkit2gtk-web-extension-4.0" = return "webkitgtk"

158libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that

167libNixName "webkitgtk-3.0" = return "webkitgtk24x-gtk3" -- These are the old APIs, of which 2.4 is the last provider, so map directly to that

159libNixName "X11" = return "libX11"

168libNixName "X11" = return "libX11"

160libNixName "x11" = return "xlibsWrapper"

169libNixName "x11" = return "xlibsWrapper"

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

194buildToolNixName "nix-hash" = return "nix"

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

195buildToolNixName "nix-instantiate" = return "nix"

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

196buildToolNixName "nix-store" = return "nix"

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

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

198buildToolNixName x = return (fromString x)

206buildToolNixName x = return (fromString x)

199

207

200-- | 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+16−10

@@ -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

@@ -21,7 +22,7 @@ import Language.Nix

22postProcess :: Derivation -> Derivation

23postProcess :: Derivation -> Derivation

23postProcess deriv =

24postProcess deriv =

24− foldr (.) id [ f | (Dependency n vr, f) <- hooks, packageName deriv == n, packageVersion deriv `withinRange` vr ]

25+ foldr (.) id [ f | (Dependency n vr _, f) <- hooks, packageName deriv == n, packageVersion deriv `withinRange` vr ]

25 . fixGtkBuilds

26 . fixGtkBuilds

26 . fixBuildDependsForTools

27 . fixBuildDependsForTools

27 $ deriv

28 $ deriv

@@ -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 )

@@ -229,13 +230,12 @@ gitAnnexHook = set phaseOverrides gitAnnexOverrides

229 where

230 where

230 gitAnnexOverrides = unlines

231 gitAnnexOverrides = unlines

231 [ "preConfigure = \"export HOME=$TEMPDIR; patchShebangs .\";"

232 [ "preConfigure = \"export HOME=$TEMPDIR; patchShebangs .\";"

232− , "installPhase = \"make PREFIX=$out BUILDER=: install\";"

233+ , "postBuild = ''"

233− , "checkPhase = ''"

234 , " ln -sf dist/build/git-annex/git-annex git-annex"

235 , " ln -sf git-annex git-annex-shell"

236− , " export PATH+=\":$PWD\""

237− , " git-annex test"

238 , "'';"

236 , "'';"

237+ , "installPhase = \"make PREFIX=$out BUILDER=: install install-completions\";"

238+ , "checkPhase = ''PATH+=\":$PWD\" git-annex test'';"

239 , "enableSharedExecutables = false;"

240 ]

241 buildInputs = pkgs ["git","rsync","gnupg","curl","wget","lsof","openssh","which","bup","perl"]

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

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

257 -- Parallel compilation fails. Disable it.

258 , "'';"

259− , "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'';"

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

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

262 ]

@@ -292,8 +292,8 @@ darcsInstallPostInstall = unlines

292xmonadPostInstall :: String

293xmonadPostInstall = unlines

294 [ "postInstall = ''"

295− , " install -D man/xmonad.1 $doc/share/man/man1/xmonad.1"

295+ , " install -D man/xmonad.1 ''${!outputDoc}/share/man/man1/xmonad.1"

296− , " install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs"

296+ , " install -D man/xmonad.hs ''${!outputDoc}/share/doc/$name/sample-xmonad.hs"

297 , "'';"

298 ]

299

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

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

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

src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+28−3

@@ -9,9 +9,12 @@ import qualified Data.Text as T

9import Data.Yaml

10import Distribution.Compiler

11import Distribution.Package

12+import Distribution.Parsec

12import Distribution.System

13import Distribution.System

13−import Distribution.Text

14+import Distribution.Pretty as Cabal

15+import qualified Data.Version as Base

14import Distribution.Version

16import Distribution.Version

17+import Language.Nix.PrettyPrinting as Nix

16instance NFData CompilerInfo

19instance NFData CompilerInfo

17instance NFData AbiTag

20instance NFData AbiTag

@@ -49,6 +52,10 @@ instance FromJSON PackageIdentifier where

49 parseJSON (String s) = return (fromString (T.unpack s))

52 parseJSON (String s) = return (fromString (T.unpack s))

50 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell package identifier")

53 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell package identifier")

55+instance FromJSON VersionRange where

56+ parseJSON (String s) = return (fromString (T.unpack s))

57+ parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Cabal VersionRange")

58+

52instance FromJSON Dependency where

59instance FromJSON Dependency where

53 parseJSON (String s) = return (fromString (T.unpack s))

60 parseJSON (String s) = return (fromString (T.unpack s))

54 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell Dependency")

61 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell Dependency")

@@ -57,7 +64,25 @@ instance FromJSON CompilerInfo where

57 parseJSON (String s) = return (unknownCompilerInfo (fromString (T.unpack s)) NoAbiTag)

64 parseJSON (String s) = return (unknownCompilerInfo (fromString (T.unpack s)) NoAbiTag)

58 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell compiler")

65 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell compiler")

67+instance Nix.Pretty Version where

68+ pPrint = pretty

69+

70+instance Nix.Pretty PackageName where

71+ pPrint = pretty

72+

73+instance Nix.Pretty PackageIdentifier where

74+ pPrint = pretty

75+

76+instance Nix.Pretty CompilerId where

77+ pPrint = pretty

78+

79+instance Nix.Pretty Platform where

80+ pPrint = pretty

81+

82+instance Nix.Pretty Base.Version where

83+ pPrint = text . Base.showVersion

84+

60-- parsing tools

85-- parsing tools

62−text2isString :: Text a => String -> String -> a

87+text2isString :: Parsec a => String -> String -> a

63−text2isString t s = fromMaybe (error ("fromString: " ++ show s ++ " is not a valid " ++ t)) (simpleParse s)

88+text2isString t s = fromMaybe (error ("fromString: " ++ show s ++ " is not a valid " ++ t)) (simpleParsec s)

src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+9−8

@@ -11,16 +11,18 @@ import qualified Data.ByteString.Char8 as BS

11import Data.List ( isSuffixOf, isPrefixOf )

12import qualified Data.Map as DB

13import Data.Maybe

14+import qualified Data.Text as T

15+import qualified Data.Text.Encoding as T

14import Data.Time

16import Data.Time

15import Distribution.Nixpkgs.Fetch

17import Distribution.Nixpkgs.Fetch

16import Distribution.Nixpkgs.Hashes

18import Distribution.Nixpkgs.Hashes

17import qualified Distribution.Nixpkgs.Haskell.Hackage as DB

19import qualified Distribution.Nixpkgs.Haskell.Hackage as DB

20+import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

18import qualified Distribution.Package as Cabal

21import qualified Distribution.Package as Cabal

19import Distribution.PackageDescription

22import Distribution.PackageDescription

20import qualified Distribution.PackageDescription as Cabal

23import qualified Distribution.PackageDescription as Cabal

21import Distribution.PackageDescription.Parsec as Cabal

24import Distribution.PackageDescription.Parsec as Cabal

22−import Distribution.Parsec.Common (showPError)

25+import Distribution.Parsec

23−import Distribution.Text ( simpleParse, display )

24import Distribution.Version

26import Distribution.Version

25import qualified Hpack.Config as Hpack

27import qualified Hpack.Config as Hpack

26import qualified Hpack.Render as Hpack

28import qualified Hpack.Render as Hpack

@@ -29,8 +31,7 @@ import System.Directory ( doesDirectoryExist, doesFileExist, createDirectoryIfMi

29import System.Exit ( exitFailure )

31import System.Exit ( exitFailure )

30import System.FilePath ( (</>), (<.>) )

32import System.FilePath ( (</>), (<.>) )

31import System.IO

33import System.IO

32−import qualified Data.Text as T

34+import Text.PrettyPrint.HughesPJClass hiding ( first )

33−import qualified Data.Text.Encoding as T

35data HpackUse

36data HpackUse

36 = ForceHpack

37 = ForceHpack

@@ -107,12 +108,12 @@ fromDB hackageDBIO pkg = do

107 return (ds, setCabalFileHash (DB.cabalFileSha256 vd) (DB.cabalFile vd))

108 return (ds, setCabalFileHash (DB.cabalFileSha256 vd) (DB.cabalFile vd))

108 where

109 where

109 pkgId :: Cabal.PackageIdentifier

110 pkgId :: Cabal.PackageIdentifier

110− pkgId = fromMaybe (error ("invalid Haskell package id " ++ show pkg)) (simpleParse pkg)

111+ pkgId = fromMaybe (error ("invalid Haskell package id " ++ show pkg)) (simpleParsec pkg)

111 name = Cabal.packageName pkgId

112 name = Cabal.packageName pkgId

112

113

113− unknownPackageError = fail $ "No such package " ++ display pkgId ++ " in the cabal database. Did you run cabal update?"

114+ unknownPackageError = fail $ "No such package " ++ prettyShow pkgId ++ " in the cabal database. Did you run cabal update?"

114

115

115− url = "mirror://hackage/" ++ display pkgId ++ ".tar.gz"

116+ url = "mirror://hackage/" ++ prettyShow pkgId ++ ".tar.gz"

116

117

117 version :: Version

118 version :: Version

118 version = Cabal.packageVersion pkgId

119 version = Cabal.packageVersion pkgId

@@ -175,7 +176,7 @@ sourceFromHackage optHash pkgId cabalDir = do

175 exitFailure

176 exitFailure

176

177

177showPackageIdentifier :: Cabal.GenericPackageDescription -> String

178showPackageIdentifier :: Cabal.GenericPackageDescription -> String

178−showPackageIdentifier pkgDesc = name ++ "-" ++ display version where

179+showPackageIdentifier pkgDesc = name ++ "-" ++ prettyShow version where

179 pkgId = Cabal.package . Cabal.packageDescription $ pkgDesc

180 pkgId = Cabal.package . Cabal.packageDescription $ pkgDesc

180 name = Cabal.unPackageName (Cabal.packageName pkgId)

181 name = Cabal.unPackageName (Cabal.packageName pkgId)

181 version = Cabal.packageVersion pkgId

182 version = Cabal.packageVersion pkgId

update-stackage.sh+12−9

@@ -2,11 +2,14 @@

3set -eu -o pipefail

5−tmpfile=$(mktemp "stackage-update.XXXXXXX")

5+cd "$(dirname "$0")"

6−trap "rm $tmpfile" 0

7+tmpfile=$(mktemp "update-stackage.XXXXXXX")

8+# shellcheck disable=SC2064

9+trap "rm ${tmpfile} ${tmpfile}.new" 0

10+

8−curl -L -s "https://www.stackage.org/lts/cabal.config" >"$tmpfile"

11+curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile"

9−version=$(sed -n "s/^--.*http:..www.stackage.org.snapshot.lts-//p" "$tmpfile")

12+version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile")

11# Create a simple yaml version of the file.

14# Create a simple yaml version of the file.

12sed -r \

15sed -r \

@@ -16,12 +19,13 @@ sed -r \

16 -e 's|,$||' \

19 -e 's|,$||' \

17 -e '/installed$/d' \

20 -e '/installed$/d' \

18 -e '/^$/d' \

21 -e '/^$/d' \

19− -i "$tmpfile"

22+ < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"

21# Drop restrictions on some tools where we always want the latest version.

24# Drop restrictions on some tools where we always want the latest version.

22sed -r \

25sed -r \

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

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

24 -e '/ cabal2nix /d' \

27 -e '/ cabal2nix /d' \

28+ -e '/ cabal2spec /d' \

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

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

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

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

27 -e '/ hindent /d' \

31 -e '/ hindent /d' \

@@ -31,17 +35,16 @@ sed -r \

31 -e '/ hopenssl /d' \

35 -e '/ hopenssl /d' \

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

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

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

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

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

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

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

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

37 -e '/ shake /d' \

39 -e '/ shake /d' \

38 -e '/ ShellCheck /d' \

40 -e '/ ShellCheck /d' \

39 -e '/ stack /d' \

41 -e '/ stack /d' \

40 -e '/ weeder /d' \

42 -e '/ weeder /d' \

41− -i "$tmpfile"

43+ < "${tmpfile}.new" > "${tmpfile}"

43# Drop the previous configuration ...

45# Drop the previous configuration ...

46+# shellcheck disable=SC1004

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

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

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

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

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

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