master..db540bc · typeable/cabal2nix

.travis.yml+105−131

@@ -1,161 +1,135 @@

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

22#

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'

3+# runghc make_travis_yml_2.hs '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '--hlint' '-o' '.travis.yml' 'cabal2nix.cabal'

44#

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

66#

7−# version: 0.9.20200306

8−#

9−version: ~> 1.0

107language: c

11−os: linux

12−dist: xenial

8+sudo: false

9+

1310git:

14− # whether to recursively clone submodules

15− submodules: false

11+ submodules: false # whether to recursively clone submodules

12+

1613cache:

1714 directories:

1815 - $HOME/.cabal/packages

1916 - $HOME/.cabal/store

20− - $HOME/.hlint

17+

2118before_cache:

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

19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log

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

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

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

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

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

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

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

30−jobs:

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

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

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

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

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

26+

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

28+

29+matrix:

3130 include:

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

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

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

31+ - compiler: "ghc-8.6.1"

32+ env: GHCHEAD=true

33+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}

34+ - compiler: "ghc-8.4.3"

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

36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

37+

4138 allow_failures:

42− - compiler: ghc-8.8.3

43− - compiler: ghc-8.10.1

39+ - compiler: "ghc-8.6.1"

40+

4441before_install:

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

46− - WITHCOMPILER="-w $HC"

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

48− - HCPKG="$HC-pkg"

42+ - HC=${CC}

43+ - HCPKG=${HC/ghc/ghc-pkg}

4944 - unset CC

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

51− - CABALHOME=$HOME/.cabal

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

53− - TOP=$(pwd)

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

45+ - ROOTDIR=$(pwd)

46+ - mkdir -p $HOME/.local/bin

47+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"

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

5549 - echo $HCNUMVER

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

50+

9051install:

91− - ${CABAL} --version

52+ - cabal --version

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

54+ - BENCH=${BENCH---enable-benchmarks}

55+ - TEST=${TEST---enable-tests}

56+ - HADDOCK=${HADDOCK-true}

57+ - UNCONSTRAINED=${UNCONSTRAINED-true}

58+ - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}

59+ - GHCHEAD=${GHCHEAD-false}

60+ - travis_retry cabal update -v

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

62+ - rm -fv cabal.project cabal.project.local

63+ # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage

9364 - |

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

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

96− - cat $CABALHOME/config

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

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

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

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

104− # Generate cabal.project

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

106− - touch cabal.project

107− - |

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

109− - |

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"

65+ if $GHCHEAD; then

66+ sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config

67+ for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done

68+

69+ echo 'repository head.hackage' >> ${HOME}/.cabal/config

70+ echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config

71+ echo ' secure: True' >> ${HOME}/.cabal/config

72+ echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config

73+ echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config

74+ echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config

75+ echo ' key-threshold: 3' >> ${HOME}/.cabal.config

76+

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

78+

79+ cabal new-update head.hackage -v

80+ fi

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

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

83+ - if [ $HCNUMVER -eq 80403 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi

84+ - "printf 'packages: \".\"\\n' > cabal.project"

85+ - touch cabal.project.local

86+ - "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"

11187 - cat cabal.project || true

11288 - cat cabal.project.local || true

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

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

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

116− - rm cabal.project.freeze

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

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

119−script:

89+ - if [ -f "./configure.ac" ]; then

90+ (cd "." && autoreconf -i);

91+ fi

92+ - rm -f cabal.project.freeze

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

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

95+ - rm -rf .ghc.environment.* "."/dist

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

121− # Packaging...

122− - ${CABAL} v2-sdist all

123− # Unpacking...

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

97+

98+# Here starts the actual work to be performed for the package under test;

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

100+script:

101+ # test that source-distributions can be generated

102+ - (cd "." && cabal sdist)

103+ - mv "."/dist/cabal2nix-*.tar.gz ${DISTDIR}/

125104 - cd ${DISTDIR} || false

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

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

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

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

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"

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

106+ - "printf 'packages: cabal2nix-*/*.cabal\\n' > cabal.project"

107+ - touch cabal.project.local

108+ - "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"

136109 - cat cabal.project || true

137110 - cat cabal.project.local || true

138− # Building...

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

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

141− # Building with tests and benchmarks...

112+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

113+

142114 # build & run tests, build benchmarks

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

144− # Testing...

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

146− # Doctest...

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

148− # HLint..

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

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

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

152− # cabal check...

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

154− # haddock...

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

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

157− - rm -f cabal.project.local

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

159−

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

115+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all

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

117+

118+ # doctest

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

120+

121+ # hlint

122+ - if [ $HCNUMVER -eq 80403 ]; then (cd cabal2nix-* && hlint -XMonadFailDesugaring src); fi

123+

124+ # cabal check

125+ - (cd cabal2nix-* && cabal check)

126+

127+ # haddock

128+ - rm -rf ./dist-newstyle

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

130+

131+ # Build without installed constraints for packages in global-db

132+ - 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

133+

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

161135# EOF

README.md+7−7

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

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

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

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

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

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

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

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

3232

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

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

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

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

3535

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

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

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

39−project on the local file system:

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

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

39+on the local file system:

4040

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

4242 $ cabal2nix .

cabal2nix.cabal+81−29

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

11name: cabal2nix

2−version: 2.15.1

2+version: 2.11

33synopsis: Convert Cabal files into Nix build instructions.

44description:

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

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

88 > nix-env -i cabal2nix

99license: BSD3

1010license-file: LICENSE

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

11+author: Peter Simons,

12+ Andres Loeh,

13+ Benno Fünfstück,

14+ Mateusz Kowalczyk,

15+ Michael Alan Dorman,

16+ Tom Smalley,

17+ Mathijs Kwik,

18+ Shea Levy,

19+ Dmitry Malikov,

20+ Eric Seidel,

21+ Jacob Mitchell,

22+ Graham Christensen,

23+ Hamish Mackenzie,

24+ Nikolay Amiantov,

25+ Aycan iRiCAN,

26+ Bryan Gardiner,

27+ Joe Hermaszewski,

28+ John Wiegley,

29+ Philipp Hausmann,

30+ Spencer Janssen,

31+ Tom Hunger,

32+ William Casarin,

33+ koral,

34+ ksaric,

35+ Adam Vogt,

36+ Alexey Shmalko,

37+ Corey O'Connor,

38+ Cray Elliott,

39+ David Johnson,

40+ Dmitry Bushev,

41+ Domen Kožar,

42+ Felix Kunzmann,

43+ Gabriel Ebner,

44+ Gergely Risko,

45+ Joachim Fasting,

46+ John Albietz,

47+ John Chee,

48+ Jussi Maki,

49+ Lisanna Dettwyler,

50+ Mark Laws,

51+ Mark Wotton,

52+ Matthew Pickering,

53+ Matthew Stewart,

54+ Matvey Aksenov,

55+ Nicholas Clarke,

56+ Nicolas Rolland,

57+ Oliver Charles,

58+ Pascal Wittmann,

59+ Patrick John Wheeler,

60+ Phil de Joux,

61+ Piotr Bogdan,

62+ Profpatsch,

63+ Raymond Gauthier,

64+ Renzo Carbonara,

65+ Rodney Lorrimar,

66+ Sibi,

67+ Sukant Hajra,

68+ Tanner Doshier,

69+ Vaibhav Sagar,

70+ Viktar Basharymau,

71+ danbst,

72+ karsten gebbert,

73+ laMudri,

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

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

2976stability: stable

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

77+tested-with: GHC == 8.4.3, GHC == 8.6.1

3178category: Distribution, Nix

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

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

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

60107 Distribution.Nixpkgs.Haskell.PackageSourceSpec

61108 other-modules: Paths_cabal2nix

62109 hs-source-dirs: src

63− build-depends: base > 4.11

64− , Cabal == 3.0.*

65− , aeson > 1

110+ build-depends: base < 5

111+ , Cabal > 2.2

112+ , aeson

66113 , ansi-wl-pprint

67114 , bytestring

68− , containers >= 0.5.9

115+ , containers

69116 , deepseq >= 1.4

70117 , directory

71− , distribution-nixpkgs >= 1.3.1

118+ , distribution-nixpkgs >= 1.1.1

72119 , filepath

73120 , hackage-db >= 2.0.1

74121 , hopenssl >= 2

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

84131 , transformers

85132 , yaml

86133 default-language: Haskell2010

134+ default-extensions: MonadFailDesugaring

87135 other-extensions: MultiParamTypeClasses

88136 ScopedTypeVariables

89137 FlexibleInstances

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

101149 hs-source-dirs: cabal2nix

102150 build-depends: base, cabal2nix

103151 default-language: Haskell2010

152+ default-extensions: MonadFailDesugaring

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

105154 -Wredundant-constraints

106155

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

110159 Paths_cabal2nix

111160 hs-source-dirs: hackage2nix

112161 build-depends: base < 5

113− , Cabal

162+ , Cabal > 2.2

114163 , aeson

115164 , bytestring

116165 , cabal2nix

117166 , containers

118167 , directory

119− , distribution-nixpkgs >= 1.2

168+ , distribution-nixpkgs >= 1.1.1

120169 , filepath

121170 , hopenssl >= 2

122171 , language-nix

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

127176 , optparse-applicative

128177 , pretty >= 1.1.2

129178 default-language: Haskell2010

179+ default-extensions: MonadFailDesugaring

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

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

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

132182

133183test-suite regression-test

134184 type: exitcode-stdio-1.0

135185 main-is: Main.hs

136186 hs-source-dirs: test

137187 build-depends: base

138− , Cabal

188+ , Cabal > 2.2

139189 , cabal2nix

140190 , containers

141191 , directory

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

147197 , tasty

148198 , tasty-golden

149199 default-language: Haskell2010

200+ default-extensions: MonadFailDesugaring

150201 build-tools: cabal2nix

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

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

203+ -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N

204+ -with-rtsopts=-K1K

hackage2nix/Main.hs+18−24

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

11{-# LANGUAGE OverloadedStrings #-}

22{-# LANGUAGE RecordWildCards #-}

3+{-# LANGUAGE CPP #-}

34

45module Main ( main ) where

56

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

1011import Control.Monad.Par.Combinator

1112import Control.Monad.Par.IO

1213import Control.Monad.Trans ( liftIO )

13−import Data.List ( intercalate )

14+import Data.List

1415import Data.Map.Strict ( Map )

1516import qualified Data.Map.Strict as Map

1617import Data.Maybe

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

19+import Data.Monoid

20+#endif

1721import Data.Set ( Set )

1822import qualified Data.Set as Set

1923import Data.String

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

2327import Distribution.Nixpkgs.Haskell.FromCabal

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

2529import Distribution.Nixpkgs.Haskell.FromCabal.Flags

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

2730import Distribution.Nixpkgs.Meta

2831import Distribution.Nixpkgs.PackageMap

2932import Distribution.Package

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

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

3134import Distribution.System

3235import Distribution.Text

3336import Distribution.Version

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

6366 pinfo :: ParserInfo CLI

6467 pinfo = info

6568 ( helper

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

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

6770 <*> cliOptions

6871 )

6972 ( fullDesc

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

7275 CLI {..} <- execParser pinfo

7376

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

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

78+ nixpkgs <- readNixpkgPackageMap nixpkgsRepository Nothing

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

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

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

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

8083 . 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"

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

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

8485 hackage <- fixup <$> readHackage hackageRepository

8586 let

8687 hackagePackagesFile :: FilePath

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

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

9495

9596 defaultPackageOverridesSet :: PackageSet

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

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

9798

9899 generatedDefaultPackageSet :: PackageSet

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

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

106107

107108 extraPackageSet :: PackageMultiSet

108109 extraPackageSet = Map.unionsWith Set.union

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

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

110111

111112 db :: PackageMultiSet

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

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

116117 ]

117118

118119 haskellResolver :: Dependency -> Bool

119− haskellResolver (Dependency name vrange _)

120+ haskellResolver (Dependency name vrange)

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

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

122123 | otherwise = False

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

135136 (descr, cabalSHA256) <- readPackage hackageRepository pkgId

136137 meta <- readPackageMeta hackageRepository pkgId

137138

138− let isInDefaultPackageSet, isHydraEnabled, isBroken :: Bool

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)

139+ let isInDefaultPackageSet :: Bool

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

145141

146142 tarballSHA256 :: SHA256Hash

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

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

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

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

159155 & editedCabalFile .~ cabalSHA256

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

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

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

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

165159 & metaSection.homepage .~ ""

166160

167161 overrides :: Doc

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

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

169163 return $ render $ nest 2 $

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

171165

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

205199 ]

206200

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

208−resolveConstraint' (Dependency name vrange _) hackage

202+resolveConstraint' (Dependency name vrange) hackage

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

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

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

hackage2nix/README.md−3

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

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

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

1717

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−

2118#### Setup

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

2320```

src/Cabal2nix.hs+15−23

@@ -11,12 +11,14 @@ module Cabal2nix

1111import Control.Exception ( bracket )

1212import Control.Lens

1313import Control.Monad

14−import Data.List ( intercalate, isPrefixOf )

14+import Data.List

1515import Data.List.Split

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

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

1718import qualified Data.Set as Set

1819import Data.String

1920import Data.Time

21+import qualified Distribution.Compat.ReadP as P

2022import Distribution.Compiler

2123import Distribution.Nixpkgs.Fetch

2224import Distribution.Nixpkgs.Haskell

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

2426import Distribution.Nixpkgs.Haskell.FromCabal.Flags

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

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

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

2829import Distribution.Nixpkgs.Haskell.PackageSourceSpec

2930import Distribution.Nixpkgs.Meta

30−import Distribution.Package ( packageId )

3131import Distribution.PackageDescription ( mkFlagName, mkFlagAssignment, FlagAssignment )

32−import Distribution.Parsec as P

32+import Distribution.Package ( packageId )

3333import Distribution.Simple.Utils ( lowercase )

3434import Distribution.System

35+import Distribution.Text

3536import Language.Nix

3637import Options.Applicative

3738import Paths_cabal2nix ( version )

@@ -45,10 +46,9 @@ data Options = Options

4546 , optMaintainer :: [String]

4647--, optPlatform :: [String] -- TODO: fix command line handling of platforms

4748 , optHaddock :: Bool

48− , optHpack :: HpackUse

49+ , optHpack :: Bool

4950 , optDoCheck :: Bool

5051 , optJailbreak :: Bool

51− , optDoBenchmark :: Bool

5252 , optRevision :: Maybe String

5353 , optHyperlinkSource :: Bool

5454 , optEnableLibraryProfiling :: Bool

@@ -73,17 +73,9 @@ options = Options

7373 <*> many (strOption $ long "maintainer" <> metavar "MAINTAINER" <> help "maintainer of this package (may be specified multiple times)")

7474-- <*> many (strOption $ long "platform" <> metavar "PLATFORM" <> help "supported build platforms (may be specified multiple times)")

7575 <*> flag True False (long "no-haddock" <> help "don't run Haddock when building this package")

76− <*>

77− (

78− flag' ForceHpack (long "hpack" <> help "run hpack before configuring this package (only non-hackage packages)")

79− <|>

80− flag' NoHpack (long "no-hpack" <> help "disable hpack run and use only cabal disregarding package.yaml existence")

81− <|>

82− pure PackageYamlHpack

83− )

76+ <*> switch (long "hpack" <> help "run hpack before configuring this package (only non-hackage packages)")

8477 <*> flag True False (long "no-check" <> help "don't run regression test suites of this package")

8578 <*> switch (long "jailbreak" <> help "disregard version restrictions on build inputs")

86− <*> switch (long "benchmark" <> help "enable benchmarks for this package")

8779 <*> optional (strOption $ long "revision" <> help "revision to use when fetching from VCS")

8880 <*> flag True False (long "no-hyperlink-source" <> help "don't generate pretty-printed source code for the documentation")

8981 <*> switch (long "enable-library-profiling" <> help "enable library profiling in the generated build")

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

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

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

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

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

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)

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

89+ <*> 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)

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

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

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

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

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

110102 Just utcTime -> Right utcTime

111103

112−parseCabal :: Parsec a => ReadM a

113−parseCabal = eitherReader eitherParsec

104+readP :: P.ReadP a a -> ReadM a

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

106+ (r:_) -> Right r

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

114108

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

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

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

135129 "watchos" -> "ios"

136130 "tvos" -> "ios"

137131 "linux-android" -> "linux-android"

138− "linux-androideabi" -> "linux-androideabi"

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

140133 _ -> fromMaybe os $ listToMaybe

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

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

162155pinfo :: ParserInfo Options

163156pinfo = info

164157 ( helper

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

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

166159 <*> options

167160 )

168161 ( fullDesc

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

191184 cabal2nix =<< getArgs

192185

193186hpackOverrides :: Derivation -> Derivation

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

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

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

196189

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

@@ -235,7 +228,6 @@ processPackage Options{..} pkg = do

235228 & metaSection.maintainers .~ Set.fromList (map (review ident) optMaintainer)

236229-- & metaSection.platforms .~ Set.fromList optPlatform

237230 & doCheck &&~ optDoCheck

238− & doBenchmark ||~ optDoBenchmark

239231 & extraFunctionArgs %~ Set.union (Set.fromList ("inherit stdenv":map (fromString . ("inherit " ++)) optExtraArgs))

240232

241233 shell :: Doc

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

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

161161 ExitFailure _ -> return Nothing

162162 ExitSuccess -> do

163163 buf <- BS.hGetContents stdoutH

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)

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

167165 buf' = BS.unlines (reverse ls)

168166 case length ls of

169167 0 -> return Nothing

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

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

99type Constraint = Dependency

1010

1111satisfiesConstraint :: 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)

1313

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

1515satisfiesConstraints p = all (satisfiesConstraint p)

src/Distribution/Nixpkgs/Haskell/Derivation.hs+4−7

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

77module Distribution.Nixpkgs.Haskell.Derivation

88 ( Derivation, nullDerivation, pkgid, revision, src, subpath, isLibrary, isExecutable

99 , extraFunctionArgs, libraryDepends, executableDepends, testDepends, configureFlags

10− , cabalFlags, runHaddock, jailbreak, doCheck, doBenchmark, testTarget, hyperlinkSource, enableSplitObjs

10+ , cabalFlags, runHaddock, jailbreak, doCheck, testTarget, hyperlinkSource, enableSplitObjs

1111 , enableLibraryProfiling, enableExecutableProfiling, phaseOverrides, editedCabalFile, metaSection

1212 , dependencies, setupDepends, benchmarkDepends, enableSeparateDataOutput

1313 )

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

1515

1616import Control.DeepSeq

1717import Control.Lens

18−import Data.List ( isPrefixOf )

18+import Data.List

1919import Data.Set ( Set )

2020import qualified Data.Set as Set

2121import Data.Set.Lens

@@ -55,7 +55,6 @@ data Derivation = MkDerivation

5555 , _runHaddock :: Bool

5656 , _jailbreak :: Bool

5757 , _doCheck :: Bool

58− , _doBenchmark :: Bool

5958 , _testTarget :: String

6059 , _hyperlinkSource :: Bool

6160 , _enableLibraryProfiling :: Bool

@@ -87,7 +86,6 @@ nullDerivation = MkDerivation

8786 , _runHaddock = error "undefined Derivation.runHaddock"

8887 , _jailbreak = error "undefined Derivation.jailbreak"

8988 , _doCheck = error "undefined Derivation.doCheck"

90− , _doBenchmark = error "undefined Derivation.doBenchmark"

9189 , _testTarget = error "undefined Derivation.testTarget"

9290 , _hyperlinkSource = error "undefined Derivation.hyperlinkSource"

9391 , _enableLibraryProfiling = error "undefined Derivation.enableLibraryProfiling"

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

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

113111 [ text "mkDerivation" <+> lbrace

114112 , nest 2 $ vcat

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

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

113+ [ attr "pname" $ doubleQuotes $ disp (packageName _pkgid)

114+ , attr "version" $ doubleQuotes $ disp (packageVersion _pkgid)

117115 , pPrint _src

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

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

@@ -133,7 +131,6 @@ instance Pretty Derivation where

133131 , boolattr "doHaddock" (not _runHaddock) _runHaddock

134132 , boolattr "jailbreak" _jailbreak _jailbreak

135133 , boolattr "doCheck" (not _doCheck) _doCheck

136− , boolattr "doBenchmark" _doBenchmark _doBenchmark

137134 , onlyIf (not (null _testTarget)) $ attr "testTarget" $ string _testTarget

138135 , boolattr "hyperlinkSource" (not _hyperlinkSource) _hyperlinkSource

139136 , onlyIf (not (null _phaseOverrides)) $ vcat ((map text . lines) _phaseOverrides)

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

@@ -11,6 +11,7 @@ import Data.Maybe

1111import Data.Set ( Set )

1212import qualified Data.Set as Set

1313import Distribution.Compiler

14+import Distribution.License

1415import Distribution.Nixpkgs.Haskell

1516import qualified Distribution.Nixpkgs.Haskell as Nix

1617import Distribution.Nixpkgs.Haskell.Constraint

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

5859 }

5960

6061 jailbroken :: HaskellResolver -> HaskellResolver

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

62+ jailbroken resolver (Dependency pkg _) = resolver (Dependency pkg anyVersion)

6263

6364 withInternalLibs :: HaskellResolver -> HaskellResolver

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

6566

6667 internalNames :: [PackageName]

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

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

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

6970

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

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

@@ -91,7 +92,6 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package

9192 & runHaddock .~ doHaddockPhase

9293 & jailbreak .~ False

9394 & doCheck .~ True

94− & doBenchmark .~ False

9595 & testTarget .~ mempty

9696 & hyperlinkSource .~ True

9797 & enableSplitObjs .~ True

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

108108 & Nix.description .~ synopsis

109109 & Nix.license .~ nixLicense

110110 & Nix.platforms .~ Nix.allKnownPlatforms

111− & Nix.hydraPlatforms .~ (if isFreeLicense nixLicense then Nix.allKnownPlatforms else Set.empty)

111+ & Nix.hydraPlatforms .~ (if nixLicense == Nix.Known "stdenv.lib.licenses.unfree" then Set.empty else Nix.allKnownPlatforms)

112112 & Nix.maintainers .~ mempty

113113 & Nix.broken .~ not (null missingDeps)

114114 )

@@ -116,10 +116,10 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package

116116 xrev = maybe 0 read (lookup "x-revision" customFieldsPD)

117117

118118 nixLicense :: Nix.License

119− nixLicense = either fromSPDXLicense fromCabalLicense licenseRaw

119+ nixLicense = fromCabalLicense (either licenseFromSPDX id licenseRaw)

120120

121121 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

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

124124

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

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

136136 resolveInNixpkgs :: Identifier -> Binding

137137 resolveInNixpkgs i

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

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

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

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

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

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

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

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

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

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

144144 | otherwise = bindNull i

145145

146146 resolveInHackageThenNixpkgs :: Identifier -> Binding

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

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

148148 | otherwise = resolveInNixpkgs i

149149

150150 internalLibNames :: [PackageName]

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

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

152152

153153 doHaddockPhase :: Bool

154154 doHaddockPhase | not (null internalLibNames) = False

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

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

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

160160 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 ]

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

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

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

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

166166

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

168168 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 ]

170170

171171bindNull :: Identifier -> Binding

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

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

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

11{-# LANGUAGE RecordWildCards #-}

2+{-# LANGUAGE CPP #-}

23{-# LANGUAGE FlexibleInstances #-}

34{-# LANGUAGE OverloadedStrings #-}

45{-# LANGUAGE DeriveGeneric #-}

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

67

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

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

9− )

10− where

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

119

12−import Prelude hiding ( fail )

13−

14−import Control.DeepSeq

1510import Control.Exception ( throwIO )

11+import Control.DeepSeq

1612import Control.Lens

17−import Control.Monad hiding ( fail )

18−import Control.Monad.Fail

13+import Control.Monad

1914import Data.Aeson

2015import Data.Map as Map

2116import Data.Set as Set

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

4540 -- role during dependency resolution.

4641 , extraPackages :: [Constraint]

4742

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+

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

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

5050 , 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]

6451 }

6552 deriving (Show, Generic)

6653

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

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

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

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

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

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

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

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

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

7964 parseJSON _ = error "invalid Configuration"

8065

8166instance FromJSON Identifier where

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

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

8469

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

71+

8572instance FromJSONKey Identifier where

8673 fromJSONKey = FromJSONKeyText parseKey

8774

8875instance FromJSONKey PackageName where

8976 fromJSONKey = FromJSONKeyText parseKey

9077

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+

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

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

9395

9496readConfiguration :: FilePath -> IO Configuration

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

97+readConfiguration path =

98+ decodeFileEither path >>= either throwIO assertConsistency

9699

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

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

98101assertConsistency cfg@Configuration {..} = do

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

103+

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

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

105+ disabledPackages = Map.keysSet dontDistributePackages

102106 disabledMaintainedPackages = maintainedPackages `Set.intersection` disabledPackages

103107 unless (Set.null disabledMaintainedPackages) $

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

src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+16−17

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

44

55import Distribution.Nixpkgs.Haskell.OrphanInstances ( )

66

7−import Data.Char

87import Distribution.Package

98import Distribution.PackageDescription

109import Distribution.Version

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

1615configureCabalFlags' (PackageIdentifier name version)

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

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

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

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

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

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

2321 | name == "diagrams-builder" = [enable "cairo", enable "svg", enable "ps", enable "rasterific"]

24− | name == "fltkhs" = [enable "opengl"]

2522 | name == "folds" = [disable "test-hlint"]

2623 | name == "git-annex" = [ enable "assistant"

27− , disable "benchmark"

24+ , enable "cryptonite"

2825 , enable "dbus"

29− , disable "debuglocks"

30− , enable "magicmime"

31− , enable "networkbsd"

26+ , enable "desktopnotify"

27+ , enable "dns"

28+ , enable "feed"

29+ , enable "inotify"

3230 , enable "pairing"

3331 , enable "production"

34− , enable "s3"

32+ , enable "quvi"

33+ , disable "s3"

34+ , enable "tahoe"

35+ , enable "tdfa"

36+ , ("testsuite", version `withinRange` "< 6.20170925 || >= 6.20171214")

3537 , enable "torrentparser"

36− , enable "webapp"

38+ , disable "webapp"

39+ , disable "webapp-secure"

3740 , enable "webdav"

41+ , enable "xmpp"

3842 ]

3943 | name == "haskeline" = [enable "terminfo"]

4044 | name == "haste-compiler" = [enable "portable"]

@@ -47,22 +51,17 @@ configureCabalFlags' (PackageIdentifier name version)

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

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

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

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

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

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

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

54− | name == "stack" = [enable "disable-git-info", enable "hide-dependency-versions", enable "supported-build"]

5557 | name == "xmobar" = [enable "with_alsa", enable "with_conduit", enable "with_datezone", enable "with_dbus", enable "with_inotify", enable "with_iwlib", enable "with_mpd", enable "with_mpris", enable "with_rtsopts", enable "with_threaded", enable "with_utf8", enable "with_uvmeter", enable "with_weather", enable "with_xft", enable "with_xpm"]

5658 | name == "xmonad-extras" = [disable "with_hlist", enable "with_split", enable "with_parsec"]

57− | name == "yaml" = [("system-libyaml", version >= "0.10.1.1")]

59+ | name == "yaml" = [enable "system-libyaml"]

5860 | name == "yi" = [enable "pango", enable "vty"]

5961 | otherwise = []

6062

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

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

64+enable name = (mkFlagName name, True)

6365

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

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

66−

67−mkFlagName' :: String -> FlagName

68−mkFlagName' = mkFlagName . map toLower

67+disable name = (mkFlagName name, False)

src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs+3−132

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

11{-# LANGUAGE ViewPatterns #-}

22

3−module Distribution.Nixpkgs.Haskell.FromCabal.License

4− ( fromCabalLicense

5− , fromSPDXLicense

6− , isFreeLicense

7− ) where

3+module Distribution.Nixpkgs.Haskell.FromCabal.License ( fromCabalLicense ) where

84

9−import Data.List (intercalate)

10−import Distribution.License ( License(..), knownLicenses )

115import Distribution.Nixpkgs.License

12−import Distribution.Pretty (prettyShow)

13−import qualified Distribution.SPDX as SPDX

6+import Distribution.License ( License(..), knownLicenses )

147import Distribution.Text (display)

8+import Data.List (intercalate)

159import Distribution.Version

1610

1711-- TODO: Programmatically strip trailing zeros from license version numbers.

@@ -45,126 +39,3 @@ fromCabalLicense (UnknownLicense "CC0-1.0") = Known "stdenv.lib.l

4539fromCabalLicense (UnknownLicense "BSD3ClauseORApache20") = Known "stdenv.lib.licenses.bsd3"

4640fromCabalLicense l = error $ "Distribution.Nixpkgs.Haskell.FromCabal.License.fromCabalLicense: unknown license"

4741 ++ show l ++"\nChoose one of: " ++ intercalate ", " (map display knownLicenses)

48−

49−fromSPDXLicense :: SPDX.License -> Distribution.Nixpkgs.License.License

50−fromSPDXLicense SPDX.NONE = Unknown Nothing

51−fromSPDXLicense (SPDX.License expr) =

52− case expr of

53− SPDX.ELicense simpl Nothing ->

54− -- Not handled: license exceptions

55− case simpl of

56− SPDX.ELicenseId lid ->

57− case lid of

58− SPDX.AFL_2_1 -> Known "stdenv.lib.licenses.afl21"

59− SPDX.AFL_3_0 -> Known "stdenv.lib.licenses.afl3"

60− SPDX.AGPL_3_0_only -> Known "stdenv.lib.licenses.agpl3"

61− SPDX.AGPL_3_0_or_later -> Known "stdenv.lib.licenses.agpl3Plus"

62− SPDX.APSL_2_0 -> Known "stdenv.lib.licenses.apsl20"

63− SPDX.Artistic_1_0 -> Known "stdenv.lib.licenses.artistic1"

64− SPDX.Artistic_2_0 -> Known "stdenv.lib.licenses.artistic2"

65− SPDX.Apache_2_0 -> Known "stdenv.lib.licenses.asl20"

66− SPDX.BSL_1_0 -> Known "stdenv.lib.licenses.boost"

67− SPDX.Beerware -> Known "stdenv.lib.licenses.beerware"

68− SPDX.NullBSD -> Known "stdenv.lib.licenses.bsd0"

69− SPDX.BSD_2_Clause -> Known "stdenv.lib.licenses.bsd2"

70− SPDX.BSD_3_Clause -> Known "stdenv.lib.licenses.bsd3"

71− SPDX.BSD_4_Clause -> Known "stdenv.lib.licenses.bsdOriginal"

72− SPDX.ClArtistic -> Known "stdenv.lib.licenses.clArtistic"

73− SPDX.CC0_1_0 -> Known "stdenv.lib.licenses.cc0"

74− SPDX.CC_BY_NC_SA_2_0 -> Known "stdenv.lib.licenses.cc-by-nc-sa-20"

75− SPDX.CC_BY_NC_SA_2_5 -> Known "stdenv.lib.licenses.cc-by-nc-sa-25"

76− SPDX.CC_BY_NC_SA_3_0 -> Known "stdenv.lib.licenses.cc-by-nc-sa-30"

77− SPDX.CC_BY_NC_SA_4_0 -> Known "stdenv.lib.licenses.cc-by-nc-sa-40"

78− SPDX.CC_BY_NC_4_0 -> Known "stdenv.lib.licenses.cc-by-nc-40"

79− SPDX.CC_BY_ND_3_0 -> Known "stdenv.lib.licenses.cc-by-nd-30"

80− SPDX.CC_BY_SA_2_5 -> Known "stdenv.lib.licenses.cc-by-sa-25"

81− SPDX.CC_BY_3_0 -> Known "stdenv.lib.licenses.cc-by-30"

82− SPDX.CC_BY_SA_3_0 -> Known "stdenv.lib.licenses.cc-by-sa-30"

83− SPDX.CC_BY_4_0 -> Known "stdenv.lib.licenses.cc-by-40"

84− SPDX.CC_BY_SA_4_0 -> Known "stdenv.lib.licenses.cc-by-sa-40"

85− SPDX.CDDL_1_0 -> Known "stdenv.lib.licenses.cddl"

86− SPDX.CECILL_2_0 -> Known "stdenv.lib.licenses.cecill20"

87− SPDX.CECILL_B -> Known "stdenv.lib.licenses.cecill-b"

88− SPDX.CECILL_C -> Known "stdenv.lib.licenses.cecill-c"

89− SPDX.CPAL_1_0 -> Known "stdenv.lib.licenses.cpal10"

90− SPDX.CPL_1_0 -> Known "stdenv.lib.licenses.cpl10"

91− SPDX.Curl -> Known "stdenv.lib.licenses.curl"

92− SPDX.DOC -> Known "stdenv.lib.licenses.doc"

93− SPDX.EFL_1_0 -> Known "stdenv.lib.licenses.efl10"

94− SPDX.EFL_2_0 -> Known "stdenv.lib.licenses.efl20"

95− SPDX.EPL_1_0 -> Known "stdenv.lib.licenses.epl10"

96− SPDX.EPL_2_0 -> Known "stdenv.lib.licenses.epl20"

97− SPDX.EUPL_1_1 -> Known "stdenv.lib.licenses.eupl11"

98− SPDX.GFDL_1_2_only -> Known "stdenv.lib.licenses.fdl12"

99− SPDX.GFDL_1_3_only -> Known "stdenv.lib.licenses.fdl13"

100− SPDX.GPL_1_0_only -> Known "stdenv.lib.licenses.gpl1"

101− SPDX.GPL_1_0_or_later -> Known "stdenv.lib.licenses.gpl1Plus"

102− SPDX.GPL_2_0_only -> Known "stdenv.lib.licenses.gpl2"

103− SPDX.GPL_2_0_or_later -> Known "stdenv.lib.licenses.gpl2Plus"

104− SPDX.GPL_3_0_only -> Known "stdenv.lib.licenses.gpl3"

105− SPDX.GPL_3_0_or_later -> Known "stdenv.lib.licenses.gpl3Plus"

106− SPDX.HPND -> Known "stdenv.lib.licenses.hpnd"

107− SPDX.IJG -> Known "stdenv.lib.licenses.ijg"

108− SPDX.ImageMagick -> Known "stdenv.lib.licenses.imagemagick"

109− SPDX.IPA -> Known "stdenv.lib.licenses.ipa"

110− SPDX.IPL_1_0 -> Known "stdenv.lib.licenses.ipl10"

111− SPDX.ISC -> Known "stdenv.lib.licenses.isc"

112− SPDX.JasPer_2_0 -> Known "stdenv.lib.licenses.jasper"

113− SPDX.LGPL_2_0_only -> Known "stdenv.lib.licenses.lgpl2"

114− SPDX.LGPL_2_0_or_later -> Known "stdenv.lib.licenses.lgpl2Plus"

115− SPDX.LGPL_2_1_only -> Known "stdenv.lib.licenses.lgpl21"

116− SPDX.LGPL_2_1_or_later -> Known "stdenv.lib.licenses.lgpl21Plus"

117− SPDX.LGPL_3_0_only -> Known "stdenv.lib.licenses.lgpl3"

118− SPDX.LGPL_3_0_or_later -> Known "stdenv.lib.licenses.lgpl3Plus"

119− SPDX.Libpng -> Known "stdenv.lib.licenses.libpng"

120− SPDX.Libtiff -> Known "stdenv.lib.licenses.libtiff"

121− SPDX.LPPL_1_2 -> Known "stdenv.lib.licenses.lppl12"

122− SPDX.LPPL_1_3c -> Known "stdenv.lib.licenses.lppl13c"

123− SPDX.LPL_1_02 -> Known "stdenv.lib.licenses.lpl-102"

124− SPDX.MIT -> Known "stdenv.lib.licenses.mit"

125− SPDX.MPL_1_0 -> Known "stdenv.lib.licenses.mpl10"

126− SPDX.MPL_1_1 -> Known "stdenv.lib.licenses.mpl11"

127− SPDX.MPL_2_0 -> Known "stdenv.lib.licenses.mpl20"

128− SPDX.MS_PL -> Known "stdenv.lib.licenses.mspl"

129− SPDX.NCSA -> Known "stdenv.lib.licenses.ncsa"

130− SPDX.NPOSL_3_0 -> Known "stdenv.lib.licenses.nposl3"

131− SPDX.OFL_1_1 -> Known "stdenv.lib.licenses.ofl"

132− SPDX.OLDAP_2_8 -> Known "stdenv.lib.licenses.openldap"

133− SPDX.OpenSSL -> Known "stdenv.lib.licenses.openssl"

134− SPDX.OSL_2_1 -> Known "stdenv.lib.licenses.osl21"

135− SPDX.OSL_3_0 -> Known "stdenv.lib.licenses.osl3"

136− SPDX.PHP_3_01 -> Known "stdenv.lib.licenses.php201"

137− SPDX.PostgreSQL -> Known "stdenv.lib.licenses.postgresql"

138− SPDX.Python_2_0 -> Known "stdenv.lib.licenses.psfl"

139− SPDX.QPL_1_0 -> Known "stdenv.lib.licenses.qpl"

140− SPDX.Ruby -> Known "stdenv.lib.licenses.ruby"

141− SPDX.Sendmail -> Known "stdenv.lib.licenses.sendmail"

142− SPDX.SGI_B_2_0 -> Known "stdenv.lib.licenses.sgi-b-0"

143− SPDX.Sleepycat -> Known "stdenv.lib.licenses.sleepycat"

144− SPDX.TCL -> Known "stdenv.lib.licenses.tcltx"

145− SPDX.Unlicense -> Known "stdenv.lib.licenses.unlicense"

146− SPDX.Vim -> Known "stdenv.lib.licenses.vim"

147− SPDX.VSL_1_0 -> Known "stdenv.lib.licenses.vsl10"

148− SPDX.Watcom_1_0 -> Known "stdenv.lib.licenses.watcom"

149− SPDX.W3C -> Known "stdenv.lib.licenses.w3c"

150− SPDX.WTFPL -> Known "stdenv.lib.licenses.wtfpl"

151− SPDX.Zlib -> Known "stdenv.lib.licenses.zlib"

152− SPDX.ZPL_2_0 -> Known "stdenv.lib.licenses.zpl20"

153− SPDX.ZPL_2_1 -> Known "stdenv.lib.licenses.zpl21"

154− _ ->

155− -- Licence is not in Nixpkgs.

156− -- Use the SPDX expression as a free-form license string.

157− Unknown (Just $ prettyShow expr)

158− _ ->

159− -- Not handed: the '+' suffix and user-defined licences references.

160− -- Use the SPDX expression as a free-form license string.

161− Unknown (Just $ prettyShow expr)

162− _ ->

163− -- Not handled: compound expressions, not expressible in Nixpkgs.

164− -- Use the SPDX expression as a free-form license string.

165− Unknown (Just $ prettyShow expr)

166−

167−isFreeLicense :: Distribution.Nixpkgs.License.License -> Bool

168−isFreeLicense (Known "stdenv.lib.licenses.unfree") = False

169−isFreeLicense (Unknown Nothing) = False

170−isFreeLicense _ = True

src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+7−18

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

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

3030libNixName "asound" = return "alsaLib"

3131libNixName "b2" = return "libb2"

32−libNixName "boost_context" = return "boost"

3332libNixName "bz2" = return "bzip2"

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

3534libNixName "cairo-gobject" = return "cairo"

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

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

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

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

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

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

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

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

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

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

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

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

5857libNixName "gnome-keyring" = return "gnome-keyring"

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

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

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

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

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

63−libNixName "gobject-introspection-1.0" = return "gobject-introspection"

62+libNixName "gobject-introspection-1.0" = return "gobjectIntrospection"

6463libNixName "gstreamer-audio-0.10" = return "gst-plugins-base"

6564libNixName "gstreamer-audio-1.0" = return "gst-plugins-base"

6665libNixName "gstreamer-base-0.10" = return "gst-plugins-base"

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

8584libNixName "Imlib2" = return "imlib2"

8685libNixName "iw" = return "wirelesstools"

8786libNixName "jack" = return "libjack2"

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.

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

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-4.0" = return "webkitgtk" -- This is the current API, so let it reference an alias for the latest version.

9089libNixName "jpeg" = return "libjpeg"

9190libNixName "jvm" = return "jdk"

9291libNixName "lapack" = return "liblapack"

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

9594libNixName "libavutil" = return "ffmpeg"

9695libNixName "libgsasl" = return "gsasl"

9796libNixName "libpcre" = return "pcre"

98−libNixName "libpcre2" = return "pcre2"

99−libNixName "libpcre2-8" = libNixName "libpcre2"

100−libNixName "libqrencode" = return "qrencode"

10197libNixName "libR" = return "R"

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

10399libNixName "libsystemd" = return "systemd"

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

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

109105libNixName "magic" = return "file"

110106libNixName "MagickWand" = return "imagemagick"

111−libNixName "mnl" = return "libmnl"

112107libNixName "mpi" = return "openmpi"

113108libNixName "ncursesw" = return "ncurses"

114109libNixName "netsnmp" = return "net_snmp"

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

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

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

118110libNixName "notify" = return "libnotify"

119111libNixName "odbc" = return "unixODBC"

120112libNixName "openblas" = return "openblasCompat"

@@ -135,7 +127,6 @@ libNixName "Qt5Gui" = return "qt5"

135127libNixName "Qt5Qml" = return "qt5"

136128libNixName "Qt5Quick" = return "qt5"

137129libNixName "Qt5Widgets" = return "qt5"

138−libNixName "quadprog" = return "QuadProgpp"

139130libNixName "rt" = [] -- in glibc

140131libNixName "rtlsdr" = return "rtl-sdr"

141132libNixName "ruby1.8" = return "ruby"

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

161152libNixName "wayland-cursor" = return "wayland"

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

163154libNixName "wayland-server" = return "wayland"

164−libNixName "webkit2gtk" = return "webkitgtk"

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

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

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

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

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

168158libNixName "X11" = return "libX11"

169159libNixName "x11" = return "xlibsWrapper"

@@ -182,7 +172,6 @@ libNixName "Xrender" = return "libXrender"

182172libNixName "Xss" = return "libXScrnSaver"

183173libNixName "Xtst" = return "libXtst"

184174libNixName "Xxf86vm" = return "libXxf86vm"

185−libNixName "yaml" = return "libyaml"

186175libNixName "yaml-0.1" = return "libyaml"

187176libNixName "z" = return "zlib"

188177libNixName "zmq" = return "zeromq"

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+16−68

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

1313import qualified Data.Set as Set

1414import Distribution.Nixpkgs.Haskell

1515import Distribution.Nixpkgs.Meta

16−import Distribution.Nixpkgs.License

1716import Distribution.Package

1817import Distribution.System

1918import Distribution.Text

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

2221

2322postProcess :: Derivation -> Derivation

2423postProcess deriv =

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

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

2625 . fixGtkBuilds

2726 . fixBuildDependsForTools

2827 $ deriv

@@ -56,7 +55,7 @@ fixGtkBuilds drv = drv & dependencies . pkgconfig %~ Set.filter (not . collidesW

5655-- for a while packages scraped from Hackage will continue to improperly use

5756-- `build-depends: package-for-tool` instead of `build-tool-depends` (which does

5857-- also work for Stack). Until that changes, we provide do this to work around

59−-- those package's brokenness.

58+-- those package's brokeness.

6059fixBuildDependsForTools :: Derivation -> Derivation

6160fixBuildDependsForTools = foldr (.) id

6261 [ fmap snd $ runState $ do

@@ -79,33 +78,25 @@ hooks =

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

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

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

82− , ("bustle", bustleOverrides)

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

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

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

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

8685 , ("cabal-install", set doCheck False . set phaseOverrides cabalInstallPostInstall)

87− , ("cabal2nix > 2", cabal2nixOverrides)

8886 , ("darcs", set phaseOverrides darcsInstallPostInstall . set doCheck False)

8987 , ("dbus", set doCheck False) -- don't execute tests that try to access the network

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

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

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

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

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

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

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

97− , ("gi-gio", set runHaddock True )

98− , ("gi-glib", set runHaddock True )

9993 , ("gi-gst", giGstLibOverrides "gstreamer") -- https://github.com/haskell-gi/haskell-gi/issues/36

10094 , ("gi-gstaudio", giGstLibOverrides "gst-plugins-base") -- https://github.com/haskell-gi/haskell-gi/issues/36

10195 , ("gi-gstbase", giGstLibOverrides "gst-plugins-base") -- https://github.com/haskell-gi/haskell-gi/issues/36

10296 , ("gi-gstvideo", giGstLibOverrides "gst-plugins-base") -- https://github.com/haskell-gi/haskell-gi/issues/36

103− , ("gi-gtk", set runHaddock True )

10497 , ("gi-javascriptcore < 4.0.0.0", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36

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

106− , ("gi-pango", set runHaddock True )

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

108− , ("gi-vte", set runHaddock True )

109100 , ("gi-webkit", webkitgtk24xHook) -- https://github.com/haskell-gi/haskell-gi/issues/36

110101 , ("gio", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)

111102 , ("git", set doCheck False) -- https://github.com/vincenthz/hit/issues/33

@@ -116,7 +107,6 @@ hooks =

116107 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)

117108 , ("graphviz", set (testDepends . system . contains (pkg "graphviz")) True)

118109 , ("gtk3", gtk3Hook)

119− , ("gtkglext", gtkglextHook)

120110 , ("haddock", haddockHook) -- https://github.com/haskell/haddock/issues/511

121111 , ("hakyll", set (testDepends . tool . contains (pkg "utillinux")) True) -- test suite depends on "rev"

122112 , ("haskell-src-exts", set doCheck False)

@@ -148,10 +138,9 @@ hooks =

148138 , ("network-attoparsec", set doCheck False) -- test suite requires network access

149139 , ("numeric-qq", set doCheck False) -- test suite doesn't finish even after 1+ days

150140 , ("opencv", opencvOverrides)

151− , ("pandoc >= 1.16.0.2 && < 2.5", set doCheck False) -- https://github.com/jgm/pandoc/issues/2709 and https://github.com/fpco/stackage/issues/1332

152− , ("pandoc < 2.6", pandocPre26Overrides)

153− , ("pandoc >= 2.6", pandocOverrides)

154− , ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/369

141+ , ("pandoc >= 1.16.0.2", set doCheck False) -- https://github.com/jgm/pandoc/issues/2709 and https://github.com/fpco/stackage/issues/1332

142+ , ("pandoc", set jailbreak False) -- jailbreak-cabal break the build

143+ , ("pandoc-citeproc", set doCheck False) -- https://github.com/jgm/pandoc-citeproc/issues/172

155144 , ("purescript", set doCheck False) -- test suite doesn't cope with Nix build env

156145 , ("proto-lens-protobuf-types", set (libraryDepends . tool . contains (pkg "protobuf")) True)

157146 , ("proto-lens-protoc", set (libraryDepends . tool . contains (pkg "protobuf")) True)

@@ -182,9 +171,9 @@ hooks =

182171 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)

183172 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xorg.libXinerama","pkgs.xorg.libXext","pkgs.xorg.libXrender","pkgs.xorg.libXScrnSaver"])))

184173 , ("xmonad >= 0.14.2", set phaseOverrides xmonadPostInstall)

174+ , ("yaml", set (libraryDepends . system . contains (pkg "libyaml")) True)

185175 , ("zip-archive < 0.3.1", over (testDepends . tool) (replace (self "zip") (pkg "zip")))

186176 , ("zip-archive >= 0.3.1 && < 0.3.2.3", over (testDepends . tool) (Set.union (Set.fromList [pkg "zip", pkg "unzip"]))) -- https://github.com/jgm/zip-archive/issues/35

187− , ("zip-archive >= 0.4", set (testDepends . tool . contains (pkg "which")) True)

188177 ]

189178

190179pkg :: Identifier -> Binding

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

230219 where

231220 gitAnnexOverrides = unlines

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

233− , "postBuild = ''"

222+ , "installPhase = \"make PREFIX=$out BUILDER=: install\";"

223+ , "checkPhase = ''"

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

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

226+ , " export PATH+=\":$PWD\""

227+ , " git-annex test"

236228 , "'';"

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

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

239229 , "enableSharedExecutables = false;"

240230 ]

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

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

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

257247 -- Parallel compilation fails. Disable it.

258248 , "'';"

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

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

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

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

262252 ]

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

292282xmonadPostInstall :: String

293283xmonadPostInstall = unlines

294284 [ "postInstall = ''"

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

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

285+ , " install -D man/xmonad.1 $doc/share/man/man1/xmonad.1"

286+ , " install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs"

297287 , "'';"

298288 ]

299289

@@ -360,50 +350,8 @@ webkitgtk24xHook = set (libraryDepends . pkgconfig . contains (pkg "webkitgtk24x

360350opencvOverrides :: Derivation -> Derivation

361351opencvOverrides = set phaseOverrides "hardeningDisable = [ \"bindnow\" ];"

362352 . over (libraryDepends . pkgconfig) (replace (pkg "opencv") (pkg "opencv3"))

353+ . set (configureFlags . contains "--with-gcc=${stdenv.cc}/bin/c++") True

354+ . set (configureFlags . contains "--with-ld=${stdenv.cc}/bin/c++") True

363355

364356hspecCoreOverrides :: Derivation -> Derivation -- https://github.com/hspec/hspec/issues/330

365357hspecCoreOverrides = set phaseOverrides "testTarget = \"--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'\";"

366−

367−cabal2nixOverrides :: Derivation -> Derivation

368−cabal2nixOverrides = set phaseOverrides $ unlines

369− [ "preCheck = ''"

370− , " export PATH=\"$PWD/dist/build/cabal2nix:$PATH\""

371− , " export HOME=\"$TMPDIR/home\""

372− , "'';"

373− ]

374−

375−gtkglextHook :: Derivation -> Derivation

376−gtkglextHook = over (libraryDepends . system) (Set.union (Set.fromList deps))

377− where

378− deps :: [Binding]

379− deps = bind <$> [ "pkgs.gtk2"

380− , "pkgs.libGLU"

381− , "pkgs.xorg.libSM"

382− , "pkgs.xorg.libICE"

383− , "pkgs.xorg.libXt"

384− , "pkgs.xorg.libXmu"

385− ]

386−

387−pandocPre26Overrides :: Derivation -> Derivation

388−pandocPre26Overrides = set phaseOverrides postInstall

389− where

390− postInstall = unlines [ "postInstall = ''"

391− , " mkdir -p $out/share"

392− , " mv $data/*/*/man $out/share/"

393− , "'';"

394− ]

395−

396−pandocOverrides :: Derivation -> Derivation

397−pandocOverrides = set phaseOverrides postInstall

398− where

399− postInstall = unlines [ "postInstall = ''"

400− , " mkdir -p $out/share/man/man1"

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+3−28

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

99import Data.Yaml

1010import Distribution.Compiler

1111import Distribution.Package

12−import Distribution.Parsec

1312import Distribution.System

14−import Distribution.Pretty as Cabal

15−import qualified Data.Version as Base

13+import Distribution.Text

1614import Distribution.Version

17−import Language.Nix.PrettyPrinting as Nix

1815

1916instance NFData CompilerInfo

2017instance NFData AbiTag

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

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

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

5451

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−

5952instance FromJSON Dependency where

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

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

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

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

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

6659

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−

8560-- parsing tools

8661

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

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

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

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

src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+26−39

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

11module Distribution.Nixpkgs.Haskell.PackageSourceSpec

2− ( HpackUse(..), Package(..), getPackage, getPackage', loadHackageDB, sourceFromHackage

2+ ( Package(..), getPackage, getPackage', loadHackageDB, sourceFromHackage

33 ) where

44

55import qualified Control.Exception as Exception

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

1111import Data.List ( isSuffixOf, isPrefixOf )

1212import qualified Data.Map as DB

1313import Data.Maybe

14−import qualified Data.Text as T

15−import qualified Data.Text.Encoding as T

1614import Data.Time

1715import Distribution.Nixpkgs.Fetch

1816import Distribution.Nixpkgs.Hashes

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

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

2118import qualified Distribution.Package as Cabal

2219import Distribution.PackageDescription

2320import qualified Distribution.PackageDescription as Cabal

2421import Distribution.PackageDescription.Parsec as Cabal

25−import Distribution.Parsec

22+import Distribution.Parsec.Common (showPError)

23+import Distribution.Text ( simpleParse, display )

2624import Distribution.Version

2725import qualified Hpack.Config as Hpack

2826import qualified Hpack.Render as Hpack

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

3129import System.Exit ( exitFailure )

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

3331import System.IO

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

35−

36−data HpackUse

37− = ForceHpack

38− | PackageYamlHpack

39− | NoHpack

32+import qualified Data.Text as T

33+import qualified Data.Text.Encoding as T

4034

4135data Package = Package

4236 { pkgSource :: DerivationSource

@@ -45,8 +39,8 @@ data Package = Package

4539 }

4640 deriving (Show)

4741

48−getPackage :: HpackUse

49− -- ^ the way hpack should be used.

42+getPackage :: Bool

43+ -- ^ Whether hpack should regenerate the cabal file.

5044 -> Bool

5145 -- ^ Whether to fetch submodules if fetching from git

5246 -> Maybe FilePath

@@ -58,8 +52,8 @@ getPackage :: HpackUse

5852getPackage optHpack optSubmodules optHackageDB optHackageSnapshot =

5953 getPackage' optHpack optSubmodules (loadHackageDB optHackageDB optHackageSnapshot)

6054

61−getPackage' :: HpackUse

62− -- ^ the way hpack should be used.

55+getPackage' :: Bool

56+ -- ^ Whether hpack should regenerate the cabal file.

6357 -> Bool

6458 -- ^ Whether to fetch submodules if fetching from git

6559 -> IO DB.HackageDB

@@ -69,8 +63,8 @@ getPackage' optHpack optSubmodules hackageDB source = do

6963 (derivSource, ranHpack, pkgDesc) <- fetchOrFromDB optHpack optSubmodules hackageDB source

7064 (\s -> Package s ranHpack pkgDesc) <$> maybe (sourceFromHackage (sourceHash source) (showPackageIdentifier pkgDesc) $ sourceCabalDir source) return derivSource

7165

72−fetchOrFromDB :: HpackUse

73− -- ^ the way hpack should be used

66+fetchOrFromDB :: Bool

67+ -- ^ Whether hpack should regenerate the cabal file

7468 -> Bool

7569 -- ^ Whether to fetch submodules if fetching from git

7670 -> IO DB.HackageDB

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

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

109103 where

110104 pkgId :: Cabal.PackageIdentifier

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

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

112106 name = Cabal.packageName pkgId

113107

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

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

115109

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

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

117111

118112 version :: Version

119113 version = Cabal.packageVersion pkgId

@@ -176,12 +170,12 @@ sourceFromHackage optHash pkgId cabalDir = do

176170 exitFailure

177171

178172showPackageIdentifier :: Cabal.GenericPackageDescription -> String

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

173+showPackageIdentifier pkgDesc = name ++ "-" ++ display version where

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

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

182176 version = Cabal.packageVersion pkgId

183177

184−cabalFromPath :: HpackUse -- ^ the way hpack should be used

178+cabalFromPath :: Bool -- ^ Whether hpack should regenerate the cabal file

185179 -> FilePath -> MaybeT IO (Bool, Bool, Cabal.GenericPackageDescription)

186180cabalFromPath optHpack path = do

187181 d <- liftIO $ doesDirectoryExist path

@@ -191,25 +185,21 @@ cabalFromPath optHpack path = do

191185 return (d, ranHpack, pkg)

192186 else (,,) d False <$> cabalFromFile False path

193187

194−cabalFromDirectory :: HpackUse -- ^ the way hpack should be used

188+cabalFromDirectory :: Bool -- ^ Whether hpack should regenerate the cabal file

195189 -> FilePath -> MaybeT IO (Bool, Cabal.GenericPackageDescription)

196−cabalFromDirectory ForceHpack dir = hpackDirectory dir

197−cabalFromDirectory NoHpack dir = onlyCabalFromDirectory dir "*** No .cabal file was found. Exiting."

198−cabalFromDirectory PackageYamlHpack dir = do

190+cabalFromDirectory True dir = hpackDirectory dir

191+cabalFromDirectory False dir = do

199192 useHpack <- liftIO $ doesFileExist (dir </> "package.yaml")

200193 if useHpack

201194 then do

202195 liftIO $ hPutStrLn stderr "*** found package.yaml. Using hpack..."

203196 hpackDirectory dir

204− else onlyCabalFromDirectory dir "*** Found neither a .cabal file nor package.yaml. Exiting."

205−

206−onlyCabalFromDirectory :: FilePath -> String -> MaybeT IO (Bool, Cabal.GenericPackageDescription)

207−onlyCabalFromDirectory dir errMsg = do

208− cabals <- liftIO $ getDirectoryContents dir >>= filterM doesFileExist . map (dir </>) . filter (".cabal" `isSuffixOf`)

209− case cabals of

210− [] -> fail errMsg

211− [cabalFile] -> (,) False <$> cabalFromFile True cabalFile

212− _ -> liftIO $ fail ("*** found more than one cabal file (" ++ show cabals ++ "). Exiting.")

197+ else do

198+ cabals <- liftIO $ getDirectoryContents dir >>= filterM doesFileExist . map (dir </>) . filter (".cabal" `isSuffixOf`)

199+ case cabals of

200+ [] -> fail "*** Found neither a .cabal file nor package.yaml. Exiting."

201+ [cabalFile] -> (,) False <$> cabalFromFile True cabalFile

202+ _ -> liftIO $ fail ("*** found more than one cabal file (" ++ show cabals ++ "). Exiting.")

213203

214204handleIO :: (Exception.IOException -> IO a) -> IO a -> IO a

215205handleIO = Exception.handle

@@ -226,10 +216,7 @@ hpackDirectory dir = do

226216 case mPackage of

227217 Left err -> liftIO $ hPutStrLn stderr ("*** hpack error: " ++ show err ++ ". Exiting.") >> exitFailure

228218 Right r -> do

229− let hpackOutput =

230− let body = Hpack.renderPackage [] (Hpack.decodeResultPackage r)

231− cabalVersion = Hpack.decodeResultCabalVersion r

232− in encodeUtf8 $ cabalVersion ++ body

219+ let hpackOutput = encodeUtf8 $ Hpack.renderPackage [] (Hpack.decodeResultPackage r)

233220 hash = printSHA256 $ digest (digestByName "sha256") hpackOutput

234221 case runParseGenericPackageDescription "<hpack output>" hpackOutput of

235222 Left msg -> liftIO $ do

test/Main.hs+11−3

@@ -99,6 +99,14 @@ testExecutable exe cabalFile = do

9999-- * Helper functions

100100-------------------------------------------------------------------------------

101101

102+-- | Find all *files* in the given directory. This function does not recurse,

103+-- nor does it include the special entries @'.'@ or @'..'@ in the result.

104+

105+listDirectoryFiles :: FilePath -> IO [FilePath]

106+listDirectoryFiles dirPath = do

107+ entries <- listDirectory dirPath

108+ filterM doesFileExist (map (dirPath </>) entries)

109+

102110-- | Find all *files* in the given directory that end with the given suffix.

103111-- This function does not recurse, nor does it include the special entries

104112-- @'.'@ or @'..'@ in the result.

@@ -111,9 +119,9 @@ testExecutable exe cabalFile = do

111119-- we prefer our own simpler code.

112120

113121listDirectoryFilesBySuffix :: String -> FilePath -> IO [FilePath]

114−listDirectoryFilesBySuffix suff dirPath = do

115− entries <- listDirectory dirPath

116− filterM doesFileExist [ dirPath </> e | e <- entries, takeExtension e == suff ]

122+listDirectoryFilesBySuffix suff =

123+ fmap (filter ((suff ==) . takeExtension)) . listDirectoryFiles

124+

117125

118126-- | A variant of 'writeFile' that appends a newline to the end of the buffer

119127-- before writing.

test/golden-test-cases/ede.nix.golden−1

@@ -21,5 +21,4 @@ mkDerivation {

2121 homepage = "http://github.com/brendanhay/ede";

2222 description = "Templating language with similar syntax and features to Liquid or Jinja2";

2323 license = "unknown";

24− hydraPlatforms = stdenv.lib.platforms.none;

2524}

test/golden-test-cases/gogol-adexchange-buyer.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Ad Exchange Buyer SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-admin-emailmigration.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Email Migration API v2 SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-affiliates.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Affiliate Network SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-apps-tasks.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Tasks SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-appstate.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google App State SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-blogger.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Blogger SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-datastore.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Cloud Datastore SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-dfareporting.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google DCM/DFA Reporting And Trafficking SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-firebase-rules.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Firebase Rules SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-gmail.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Gmail SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-kgsearch.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Knowledge Graph Search SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-maps-engine.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Maps Engine SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-plus.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google + SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-resourceviews.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Compute Engine Instance Groups SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-translate.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Translate SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-webmaster-tools.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google Search Console SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/gogol-youtube.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "https://github.com/brendanhay/gogol";

88 description = "Google YouTube Data SDK";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/hxt-expat.nix.golden−1

@@ -7,5 +7,4 @@ mkDerivation {

77 homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";

88 description = "Expat parser for HXT";

99 license = "unknown";

10− hydraPlatforms = stdenv.lib.platforms.none;

1110}

test/golden-test-cases/hxt-tagsoup.nix.golden−1

@@ -11,5 +11,4 @@ mkDerivation {

1111 homepage = "https://github.com/UweSchmidt/hxt";

1212 description = "TagSoup parser for HXT";

1313 license = "unknown";

14− hydraPlatforms = stdenv.lib.platforms.none;

1514}

test/golden-test-cases/opencv.nix.golden+3

@@ -9,6 +9,9 @@ mkDerivation {

99 pname = "opencv";

1010 version = "0.0.2.1";

1111 sha256 = "deadbeef";

12+ configureFlags = [

13+ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"

14+ ];

1215 setupHaskellDepends = [ base Cabal ];

1316 libraryHaskellDepends = [

1417 aeson base base64-bytestring bindings-DSL bytestring containers

test/golden-test-cases/openpgp-asciiarmor.nix.golden−1

@@ -15,5 +15,4 @@ mkDerivation {

1515 homepage = "http://floss.scru.org/openpgp-asciiarmor";

1616 description = "OpenPGP (RFC4880) ASCII Armor codec";

1717 license = "unknown";

18− hydraPlatforms = stdenv.lib.platforms.none;

1918}

test/golden-test-cases/swagger.nix.golden−1

@@ -11,5 +11,4 @@ mkDerivation {

1111 testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];

1212 description = "Implementation of swagger data model";

1313 license = "unknown";

14− hydraPlatforms = stdenv.lib.platforms.none;

1514}

update-stackage.sh+9−13

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

22

33set -eu -o pipefail

44

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

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

6+trap "rm $tmpfile" 0

67

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

8−# shellcheck disable=SC2064

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

10−

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

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

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

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

1310

1411# Create a simple yaml version of the file.

1512sed -r \

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

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

2017 -e '/installed$/d' \

2118 -e '/^$/d' \

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

19+ -i "$tmpfile"

2320

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

2522sed -r \

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

2724 -e '/ cabal2nix /d' \

28− -e '/ cabal2spec /d' \

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

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

3127 -e '/ hindent /d' \

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

3531 -e '/ hopenssl /d' \

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

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

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

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

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

39− -e '/ shake /d' \

4037 -e '/ ShellCheck /d' \

4138 -e '/ stack /d' \

4239 -e '/ weeder /d' \

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

40+ -i "$tmpfile"

4441

4542# Drop the previous configuration ...

46−# shellcheck disable=SC1004

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

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

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

4945

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