git.iko.soy/typeable/cabal2nix
on e8dcbf9 help sign in
17 files changed+192−206
since splitsnapshots
unifiedsplit
.travis.yml+53−70 README.md+6−6 cabal2nix.cabal+75−24 hackage2nix/Main.hs+8−9 hackage2nix/README.md−3 src/Cabal2nix.hs+13−11 src/Distribution/Nixpkgs/Fetch.hs+1−3 src/Distribution/Nixpkgs/Haskell/Constraint.hs+1−1 src/Distribution/Nixpkgs/Haskell/Derivation.hs+3−3 src/Distribution/Nixpkgs/Haskell/FromCabal.hs+7−7 src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+2−5 src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+3−9 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−7 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+4−11 src/Distribution/Nixpkgs/Haskell/OrphanInstances.hs+3−24 src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+8−9 update-stackage.sh+3−4
.travis.yml+53−70
@@ -1,14 +1,12 @@
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+# haskell-ci '--installed=+all -Cabal' '--hlint' '--doctest' '--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen' '-o' '.travis.yml' 'cabal2nix.cabal'
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.9.20200306
7+# version: 0.3.20190413
88#
9−version: ~> 1.0
109language: c
11−os: linux
1210dist: xenial
1311git:
1412 # whether to recursively clone submodules
@@ -17,7 +15,6 @@ cache:
1715 directories:
1816 - $HOME/.cabal/packages
1917 - $HOME/.cabal/store
20− - $HOME/.hlint
2118before_cache:
2219 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2320 # remove files that are regenerated by 'cabal update'
@@ -27,135 +24,121 @@ before_cache:
2724 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2825 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2926 - rm -rfv $CABALHOME/packages/head.hackage
30−jobs:
27+matrix:
3128 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
41− allow_failures:
42− - compiler: ghc-8.8.3
43− - compiler: ghc-8.10.1
29+ - compiler: ghc-8.6.4
30+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
4431before_install:
4532 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
46− - WITHCOMPILER="-w $HC"
47− - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
4833 - HCPKG="$HC-pkg"
4934 - unset CC
5035 - CABAL=/opt/ghc/bin/cabal
5136 - CABALHOME=$HOME/.cabal
5237 - export PATH="$CABALHOME/bin:$PATH"
5338 - TOP=$(pwd)
54− - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
39+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
5540 - echo $HCNUMVER
56− - CABAL="$CABAL -vnormal+nowrap"
41+ - CABAL="$CABAL -vnormal+nowrap+markoutput"
5742 - set -o pipefail
43+ - |
44+ echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
45+ echo 'BEGIN { state = "output"; }' >> .colorful.awk
46+ echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
47+ echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
48+ echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
49+ echo ' if (state == "cabal") {' >> .colorful.awk
50+ echo ' print blue($0)' >> .colorful.awk
51+ echo ' } else {' >> .colorful.awk
52+ echo ' print $0' >> .colorful.awk
53+ echo ' }' >> .colorful.awk
54+ echo '}' >> .colorful.awk
55+ - cat .colorful.awk
56+ - |
57+ color_cabal_output () {
58+ awk -f $TOP/.colorful.awk
59+ }
60+ - echo text | color_cabal_output
61+install:
62+ - ${CABAL} --version
63+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
5864 - TEST=--enable-tests
5965 - BENCH=--enable-benchmarks
60− - HEADHACKAGE=false
61− - if [ $HCNUMVER -ge 80800 ] ; then HEADHACKAGE=true ; fi
66+ - GHCHEAD=${GHCHEAD-false}
6267 - rm -f $CABALHOME/config
6368 - |
6469 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
6570 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
66− echo "write-ghc-environment-files: always" >> $CABALHOME/config
6771 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
6872 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
6973 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
7074 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
7175 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
72− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
7376 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
7477 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
7578 echo "install-dirs user" >> $CABALHOME/config
7679 echo " prefix: $CABALHOME" >> $CABALHOME/config
7780 echo "repository hackage.haskell.org" >> $CABALHOME/config
7881 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
79− - |
80− if $HEADHACKAGE; then
81− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
82− echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config
83− echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config
84− echo " secure: True" >> $CABALHOME/config
85− echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config
86− echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config
87− echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
88− echo " key-threshold: 3" >> $CABALHOME/config
89− fi
90−install:
91− - ${CABAL} --version
92− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
93− - |
94− echo "program-default-options" >> $CABALHOME/config
95− echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
9682 - cat $CABALHOME/config
9783 - rm -fv cabal.project cabal.project.local cabal.project.freeze
9884 - 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
85+ - ${CABAL} v2-install -w ${HC} -j2 doctest --constraint='doctest ==0.16.*' | color_cabal_output
86+ - ${CABAL} v2-install -w ${HC} -j2 hlint --constraint='hlint ==2.1.*' | color_cabal_output
10487 # Generate cabal.project
10588 - rm -rf cabal.project cabal.project.local cabal.project.freeze
10689 - touch cabal.project
10790 - |
108− echo "packages: ." >> cabal.project
91+ echo 'packages: "."' >> cabal.project
10992 - |
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"
93+ echo "write-ghc-environment-files: always" >> cabal.project
94+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(Cabal|cabal2nix)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
11195 - cat cabal.project || true
11296 - cat cabal.project.local || true
11397 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
114− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
98+ - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
11599 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
116100 - 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
101+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
102+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
119103script:
120104 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
121105 # Packaging...
122− - ${CABAL} v2-sdist all
106+ - ${CABAL} v2-sdist all | color_cabal_output
123107 # Unpacking...
124108 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
125109 - 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.]*')"
110+ - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
129111 # Generate cabal.project
130112 - rm -rf cabal.project cabal.project.local cabal.project.freeze
131113 - touch cabal.project
132114 - |
133− echo "packages: ${PKGDIR_cabal2nix}" >> cabal.project
115+ echo 'packages: "cabal2nix-*/*.cabal"' >> cabal.project
134116 - |
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"
117+ echo "write-ghc-environment-files: always" >> cabal.project
118+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(Cabal|cabal2nix)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
136119 - cat cabal.project || true
137120 - cat cabal.project.local || true
138121 # Building...
139122 # this builds all libraries and executables (without tests/benchmarks)
140− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
123+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
141124 # Building with tests and benchmarks...
142125 # build & run tests, build benchmarks
143− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
126+ - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
144127 # Testing...
145− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
128+ - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
146129 # Doctest...
147− - (cd ${PKGDIR_cabal2nix} && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen src)
130+ - (cd cabal2nix-* && doctest -i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XMonadFailDesugaring src)
148131 # 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
132+ - (cd cabal2nix-* && hlint -XMonadFailDesugaring src)
133+ - (cd cabal2nix-* && hlint -XMonadFailDesugaring hackage2nix)
134+ - (cd cabal2nix-* && hlint -XMonadFailDesugaring cabal2nix)
152135 # cabal check...
153− - (cd ${PKGDIR_cabal2nix} && ${CABAL} -vnormal check)
136+ - (cd cabal2nix-* && ${CABAL} -vnormal check)
154137 # haddock...
155− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
138+ - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
156139 # Building without installed constraints for packages in global-db...
157140 - rm -f cabal.project.local
158− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
141+ - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
159142
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"])
143+# REGENDATA ["--installed=+all -Cabal","--hlint","--doctest","--doctest-options=-i ../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","-o",".travis.yml","cabal2nix.cabal"]
161144# EOF
README.md+6−6
@@ -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
33+Detailed instructions how to use those generated files with Nix can be found at
3434https://nixos.org/nixpkgs/manual/#how-to-create-nix-builds-for-your-own-private-haskell-packages.
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+75−24
@@ -1,5 +1,5 @@
11name: cabal2nix
2−version: 2.15.1
2+version: 2.14.3
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.6.4
3178category: Distribution, Nix
3279homepage: https://github.com/nixos/cabal2nix#readme
3380bug-reports: https://github.com/nixos/cabal2nix/issues
@@ -61,14 +108,14 @@ library
61108 other-modules: Paths_cabal2nix
62109 hs-source-dirs: src
63110 build-depends: base > 4.11
64− , Cabal == 3.0.*
111+ , Cabal > 2.4
65112 , aeson > 1
66113 , ansi-wl-pprint
67114 , bytestring
68115 , containers >= 0.5.9
69116 , deepseq >= 1.4
70117 , directory
71− , distribution-nixpkgs >= 1.3.1
118+ , distribution-nixpkgs >= 1.2
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,7 +159,7 @@ executable hackage2nix
110159 Paths_cabal2nix
111160 hs-source-dirs: hackage2nix
112161 build-depends: base < 5
113− , Cabal
162+ , Cabal > 2.4
114163 , aeson
115164 , bytestring
116165 , cabal2nix
@@ -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.4
139189 , cabal2nix
140190 , containers
141191 , directory
@@ -147,6 +197,7 @@ 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
152203 -Wredundant-constraints -threaded -with-rtsopts=-K64K
hackage2nix/Main.hs+8−9
@@ -10,7 +10,7 @@ import Control.Monad
1010import Control.Monad.Par.Combinator
1111import Control.Monad.Par.IO
1212import Control.Monad.Trans ( liftIO )
13−import Data.List ( intercalate )
13+import Data.List
1414import Data.Map.Strict ( Map )
1515import qualified Data.Map.Strict as Map
1616import Data.Maybe
@@ -23,7 +23,6 @@ import Distribution.Nixpkgs.Haskell.Constraint
2323import Distribution.Nixpkgs.Haskell.FromCabal
2424import Distribution.Nixpkgs.Haskell.FromCabal.Configuration as Config
2525import Distribution.Nixpkgs.Haskell.FromCabal.Flags
26−import Distribution.Nixpkgs.Haskell.OrphanInstances ( )
2726import Distribution.Nixpkgs.Meta
2827import Distribution.Nixpkgs.PackageMap
2928import Distribution.Package
@@ -63,7 +62,7 @@ main = do
6362 pinfo :: ParserInfo CLI
6463 pinfo = info
6564 ( helper
66− <*> infoOption ("hackage2nix " ++ prettyShow Main.version) (long "version" <> help "Show version number")
65+ <*> infoOption ("hackage2nix " ++ display Main.version) (long "version" <> help "Show version number")
6766 <*> cliOptions
6867 )
6968 ( fullDesc
@@ -93,7 +92,7 @@ main = do
9392 latestVersionSet = Map.map Set.findMax (Map.filter (not . Set.null) (Map.mapWithKey (enforcePreferredVersions preferredVersions) hackage))
9493
9594 defaultPackageOverridesSet :: PackageSet
96− defaultPackageOverridesSet = Map.fromList [ (name, resolveConstraint c hackage) | c@(Dependency name _ _) <- defaultPackageOverrides config ]
95+ defaultPackageOverridesSet = Map.fromList [ (name, resolveConstraint c hackage) | c@(Dependency name _) <- defaultPackageOverrides config ]
9796
9897 generatedDefaultPackageSet :: PackageSet
9998 generatedDefaultPackageSet = (defaultPackageOverridesSet `Map.union` latestVersionSet) `Map.difference` corePackageSet
@@ -106,7 +105,7 @@ main = do
106105
107106 extraPackageSet :: PackageMultiSet
108107 extraPackageSet = Map.unionsWith Set.union
109− [ Map.singleton name (Set.singleton (resolveConstraint c hackage)) | c@(Dependency name _ _) <- extraPackages config ]
108+ [ Map.singleton name (Set.singleton (resolveConstraint c hackage)) | c@(Dependency name _) <- extraPackages config ]
110109
111110 db :: PackageMultiSet
112111 db = Map.unionsWith Set.union [ Map.map Set.singleton generatedDefaultPackageSet
@@ -116,7 +115,7 @@ main = do
116115 ]
117116
118117 haskellResolver :: Dependency -> Bool
119− haskellResolver (Dependency name vrange _)
118+ haskellResolver (Dependency name vrange)
120119 | Just v <- Map.lookup name corePackageSet = v `withinRange` vrange
121120 | Just v <- Map.lookup name generatedDefaultPackageSet = v `withinRange` vrange
122121 | otherwise = False
@@ -138,7 +137,7 @@ main = do
138137 let isInDefaultPackageSet, isHydraEnabled, isBroken :: Bool
139138 isInDefaultPackageSet = (== Just v) (Map.lookup name generatedDefaultPackageSet)
140139 isHydraEnabled = isInDefaultPackageSet && not (isBroken || name `Set.member` dontDistributePackages config)
141− isBroken = any (withinRange v) [ vr | Dependency pn vr _ <- brokenPackages config, pn == name ]
140+ isBroken = any (withinRange v) [ vr | Dependency pn vr <- brokenPackages config, pn == name ]
142141
143142 droppedPlatforms :: Set Platform
144143 droppedPlatforms = Map.findWithDefault mempty name (unsupportedPlatforms config)
@@ -165,7 +164,7 @@ main = do
165164 & metaSection.homepage .~ ""
166165
167166 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) ]
167+ overrides = fcat $ punctuate space [ disp b <> semi | b <- Set.toList (view (dependencies . each) drv `Set.union` view extraFunctionArgs drv), not (isFromHackage b) ]
169168 return $ render $ nest 2 $
170169 hang (doubleQuotes (text attr) <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)
171170
@@ -205,7 +204,7 @@ resolveConstraint c = fromMaybe (error msg) . resolveConstraint' c
205204 ]
206205
207206resolveConstraint' :: Constraint -> Hackage -> Maybe Version
208−resolveConstraint' (Dependency name vrange _) hackage
207+resolveConstraint' (Dependency name vrange) hackage
209208 | Just vset' <- Map.lookup name hackage
210209 , vset <- Set.filter (`withinRange` vrange) vset'
211210 , 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+13−11
@@ -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 )
@@ -93,8 +94,8 @@ options = Options
9394 <*> optional (strOption $ long "hackage-db" <> metavar "PATH" <> help "path to the local hackage db in tar format")
9495 <*> switch (long "shell" <> help "generate output suitable for nix-shell")
9596 <*> 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)
97+ <*> option (readP parse) (long "compiler" <> help "compiler to use when evaluating the Cabal file" <> value buildCompilerId <> showDefaultWith display)
98+ <*> option (maybeReader parsePlatform) (long "system" <> help "host system (in either short Nix format or full LLVM style) to use when evaluating the Cabal file" <> value buildPlatform <> showDefaultWith display)
9899 <*> optional (strOption $ long "subpath" <> metavar "PATH" <> help "Path to Cabal file's directory relative to the URI (default is root directory)")
99100 <*> optional (option utcTimeReader (long "hackage-snapshot" <> help "hackage snapshot time, ISO format"))
100101 <*> pure (\i -> Just (binding # (i, path # [ident # "pkgs", i])))
@@ -109,8 +110,10 @@ utcTimeReader = eitherReader $ \arg ->
109110 Nothing -> Left $ "Cannot parse date, ISO format used ('2017-11-20T12:18:35Z'): " ++ arg
110111 Just utcTime -> Right utcTime
111112
112−parseCabal :: Parsec a => ReadM a
113−parseCabal = eitherReader eitherParsec
113+readP :: P.ReadP a a -> ReadM a
114+readP p = eitherReader $ \s -> case [ r' | (r',"") <- P.readP_to_S p s ] of
115+ (r:_) -> Right r
116+ _ -> Left ("invalid value " ++ show s)
114117
115118-- | Replicate the normalization performed by GHC_CONVERT_CPU in GHC's aclocal.m4
116119-- since the output of that is what Cabal parses.
@@ -135,7 +138,6 @@ ghcConvertOS os = case os of
135138 "watchos" -> "ios"
136139 "tvos" -> "ios"
137140 "linux-android" -> "linux-android"
138− "linux-androideabi" -> "linux-androideabi"
139141 _ | "linux-" `isPrefixOf` os -> "linux"
140142 _ -> fromMaybe os $ listToMaybe
141143 [prefix | prefix <- osPrefixes, prefix `isPrefixOf` os]
@@ -162,7 +164,7 @@ parsePlatformParts = \case
162164pinfo :: ParserInfo Options
163165pinfo = info
164166 ( helper
165− <*> infoOption ("cabal2nix " ++ prettyShow version) (long "version" <> help "Show version number")
167+ <*> infoOption ("cabal2nix " ++ display version) (long "version" <> help "Show version number")
166168 <*> options
167169 )
168170 ( fullDesc
@@ -191,7 +193,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() ->
191193 cabal2nix =<< getArgs
192194
193195hpackOverrides :: Derivation -> Derivation
194−hpackOverrides = over phaseOverrides (++ "prePatch = \"hpack\";")
196+hpackOverrides = over phaseOverrides (++ "preConfigure = \"hpack\";")
195197 . set (libraryDepends . tool . contains (PP.pkg "hpack")) True
196198
197199cabal2nix' :: Options -> IO (Either Doc Derivation)
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+3−3
@@ -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
@@ -112,8 +112,8 @@ instance Pretty Derivation where
112112 pPrint drv@MkDerivation {..} = funargs (map text ("mkDerivation" : toAscList inputs)) $$ vcat
113113 [ text "mkDerivation" <+> lbrace
114114 , nest 2 $ vcat
115− [ attr "pname" $ doubleQuotes $ pPrint (packageName _pkgid)
116− , attr "version" $ doubleQuotes $ pPrint (packageVersion _pkgid)
115+ [ attr "pname" $ doubleQuotes $ disp (packageName _pkgid)
116+ , attr "version" $ doubleQuotes $ disp (packageVersion _pkgid)
117117 , pPrint _src
118118 , onlyIf (_subpath /= ".") $ attr "postUnpack" postUnpack
119119 , onlyIf (_revision > 0) $ attr "revision" $ doubleQuotes $ int _revision
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+7−7
@@ -58,14 +58,14 @@ finalizeGenericPackageDescription haskellResolver arch compiler flags constraint
5858 }
5959
6060 jailbroken :: HaskellResolver -> HaskellResolver
61− jailbroken resolver (Dependency pkg _ _) = resolver (Dependency pkg anyVersion mempty)
61+ jailbroken resolver (Dependency pkg _) = resolver (Dependency pkg anyVersion)
6262
6363 withInternalLibs :: HaskellResolver -> HaskellResolver
6464 withInternalLibs resolver d = depPkgName d `elem` internalNames || resolver d
6565
6666 internalNames :: [PackageName]
6767 internalNames = [ unqualComponentNameToPackageName n | (n,_) <- condSubLibraries genDesc ]
68− ++ [ unqualComponentNameToPackageName n | LSubLibName n <- libName <$> subLibraries (packageDescription genDesc) ]
68+ ++ [ unqualComponentNameToPackageName n | Just n <- libName <$> subLibraries (packageDescription genDesc) ]
6969
7070 in case finalize (jailbroken (withInternalLibs haskellResolver)) of
7171 Left m -> case finalize (const True) of
@@ -119,7 +119,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
119119 nixLicense = either fromSPDXLicense fromCabalLicense 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
@@ -144,11 +144,11 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
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+2−5
@@ -9,13 +9,10 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Configuration
99 )
1010 where
1111
12−import Prelude hiding ( fail )
13−
1412import Control.DeepSeq
1513import Control.Exception ( throwIO )
1614import Control.Lens
17−import Control.Monad hiding ( fail )
18−import Control.Monad.Fail
15+import Control.Monad
1916import Data.Aeson
2017import Data.Map as Map
2118import Data.Set as Set
@@ -94,7 +91,7 @@ parseKey s = either error id (parseEither parseJSON (String s))
9491readConfiguration :: FilePath -> IO Configuration
9592readConfiguration path = decodeFileEither path >>= either throwIO assertConsistency
9693
97−assertConsistency :: MonadFail m => Configuration -> m Configuration
94+assertConsistency :: Monad m => Configuration -> m Configuration
9895assertConsistency cfg@Configuration {..} = do
9996 let report msg = fail ("*** configuration error: " ++ msg)
10097 maintainedPackages = Set.unions (Map.elems packageMaintainers)
src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+3−9
@@ -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,7 +15,6 @@ 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"]
@@ -28,7 +26,7 @@ configureCabalFlags' (PackageIdentifier name version)
2826 , enable "dbus"
2927 , disable "debuglocks"
3028 , enable "magicmime"
31− , enable "networkbsd"
29+ , disable "networkbsd"
3230 , enable "pairing"
3331 , enable "production"
3432 , enable "s3"
@@ -47,7 +45,6 @@ configureCabalFlags' (PackageIdentifier name version)
4745 | name == "io-streams" = [enable "NoInteractiveTests"]
4846 | name == "liquid-fixpoint" = [enable "build-external"]
4947 | name == "pandoc" = [enable "https", disable "trypandoc"]
50− | name == "pandoc-placetable" = [enable "inlineMarkdown"]
5148 | name == "persistent-sqlite" = [enable "systemlib"]
5249 | name == "reactive-banana-wx" = [disable "buildExamples"]
5350 | name == "snap-server" = [enable "openssl"]
@@ -59,10 +56,7 @@ configureCabalFlags' (PackageIdentifier name version)
5956 | otherwise = []
6057
6158enable :: String -> (FlagName,Bool)
62−enable name = (mkFlagName' name, True)
59+enable name = (mkFlagName name, True)
6360
6461disable :: String -> (FlagName,Bool)
65−disable name = (mkFlagName' name, False)
66−
67−mkFlagName' :: String -> FlagName
68−mkFlagName' = mkFlagName . map toLower
62+disable name = (mkFlagName name, False)
src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2−7
@@ -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"
@@ -95,8 +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"
10097libNixName "libqrencode" = return "qrencode"
10198libNixName "libR" = return "R"
10299libNixName "libsoup-gnome-2.4" = return "libsoup"
@@ -112,9 +109,6 @@ libNixName "mnl" = return "libmnl"
112109libNixName "mpi" = return "openmpi"
113110libNixName "ncursesw" = return "ncurses"
114111libNixName "netsnmp" = return "net_snmp"
115−libNixName "nix-expr" = return "nix"
116−libNixName "nix-main" = return "nix"
117−libNixName "nix-store" = return "nix"
118112libNixName "notify" = return "libnotify"
119113libNixName "odbc" = return "unixODBC"
120114libNixName "openblas" = return "openblasCompat"
@@ -203,6 +197,7 @@ buildToolNixName "nix-env" = return "nix"
203197buildToolNixName "nix-hash" = return "nix"
204198buildToolNixName "nix-instantiate" = return "nix"
205199buildToolNixName "nix-store" = return "nix"
200+buildToolNixName "pkg-config" = return "pkgconfig"
206201buildToolNixName x = return (fromString x)
207202
208203-- | Helper function to extract the package name from a String that may or may
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+4−11
@@ -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
@@ -79,7 +78,7 @@ 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
@@ -90,7 +89,7 @@ hooks =
9089 , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
9190 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
9291 , ("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.
92+ , ("fltkhs", set (libraryDepends . system . contains (pkg "fltk14")) True . set (libraryDepends . pkgconfig . contains (pkg "libGLU_combined")) True) -- TODO: fltk14 belongs into the *setup* dependencies.
9493 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
9594 , ("gi-cairo", giCairoPhaseOverrides) -- https://github.com/haskell-gi/haskell-gi/issues/36
9695 , ("gi-gdk", set runHaddock True )
@@ -256,7 +255,7 @@ gfPhaseOverrides = unlines
256255 , " sed -i \"s|numJobs (bf bi)++||\" ./Setup.hs"
257256 -- Parallel compilation fails. Disable it.
258257 , "'';"
259− , "preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH'';"
258+ , "preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';"
260259 -- The build step itself, after having built the library, needs to be able
261260 -- to find the library it just built in order to compile grammar files.
262261 ]
@@ -401,9 +400,3 @@ pandocOverrides = set phaseOverrides postInstall
401400 , " mv \"man/\"*.1 $out/share/man/man1/"
402401 , "'';"
403402 ]
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−24
@@ -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
@@ -64,25 +61,7 @@ instance FromJSON CompilerInfo where
6461 parseJSON (String s) = return (unknownCompilerInfo (fromString (T.unpack s)) NoAbiTag)
6562 parseJSON s = fail ("parseJSON: " ++ show s ++ " is not a valid Haskell compiler")
6663
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−
8564-- parsing tools
8665
87−text2isString :: Parsec a => String -> String -> a
88−text2isString t s = fromMaybe (error ("fromString: " ++ show s ++ " is not a valid " ++ t)) (simpleParsec s)
66+text2isString :: Text a => String -> String -> a
67+text2isString t s = fromMaybe (error ("fromString: " ++ show s ++ " is not a valid " ++ t)) (simpleParse s)
src/Distribution/Nixpkgs/Haskell/PackageSourceSpec.hs+8−9
@@ -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,7 +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 )
32+import qualified Data.Text as T
33+import qualified Data.Text.Encoding as T
3534
3635data HpackUse
3736 = ForceHpack
@@ -108,12 +107,12 @@ fromDB hackageDBIO pkg = do
108107 return (ds, setCabalFileHash (DB.cabalFileSha256 vd) (DB.cabalFile vd))
109108 where
110109 pkgId :: Cabal.PackageIdentifier
111− pkgId = fromMaybe (error ("invalid Haskell package id " ++ show pkg)) (simpleParsec pkg)
110+ pkgId = fromMaybe (error ("invalid Haskell package id " ++ show pkg)) (simpleParse pkg)
112111 name = Cabal.packageName pkgId
113112
114− unknownPackageError = fail $ "No such package " ++ prettyShow pkgId ++ " in the cabal database. Did you run cabal update?"
113+ unknownPackageError = fail $ "No such package " ++ display pkgId ++ " in the cabal database. Did you run cabal update?"
115114
116− url = "mirror://hackage/" ++ prettyShow pkgId ++ ".tar.gz"
115+ url = "mirror://hackage/" ++ display pkgId ++ ".tar.gz"
117116
118117 version :: Version
119118 version = Cabal.packageVersion pkgId
@@ -176,7 +175,7 @@ sourceFromHackage optHash pkgId cabalDir = do
176175 exitFailure
177176
178177showPackageIdentifier :: Cabal.GenericPackageDescription -> String
179−showPackageIdentifier pkgDesc = name ++ "-" ++ prettyShow version where
178+showPackageIdentifier pkgDesc = name ++ "-" ++ display version where
180179 pkgId = Cabal.package . Cabal.packageDescription $ pkgDesc
181180 name = Cabal.unPackageName (Cabal.packageName pkgId)
182181 version = Cabal.packageVersion pkgId
update-stackage.sh+3−4
@@ -2,8 +2,6 @@
22
33set -eu -o pipefail
44
5−cd "$(dirname "$0")"
6−
75tmpfile=$(mktemp "update-stackage.XXXXXXX")
86# shellcheck disable=SC2064
97trap "rm ${tmpfile} ${tmpfile}.new" 0
@@ -25,7 +23,6 @@ sed -r \
2523sed -r \
2624 -e '/ cabal-install /d' \
2725 -e '/ cabal2nix /d' \
28− -e '/ cabal2spec /d' \
2926 -e '/ distribution-nixpkgs /d' \
3027 -e '/ git-annex /d' \
3128 -e '/ hindent /d' \
@@ -35,6 +32,8 @@ sed -r \
3532 -e '/ hopenssl /d' \
3633 -e '/ jailbreak-cabal /d' \
3734 -e '/ json-autotype/d' \
35+ -e '/ lambdabot-core /d' \
36+ -e '/ lambdabot-irc-plugins /d' \
3837 -e '/ language-nix /d' \
3938 -e '/ shake /d' \
4039 -e '/ ShellCheck /d' \
@@ -44,7 +43,7 @@ sed -r \
4443
4544# Drop the previous configuration ...
4645# shellcheck disable=SC1004
47−sed -e '/ # LTS Haskell/,/^$/c \TODO\
46+sed -e '/# LTS Haskell/,/^$/c \TODO\
4847' -i nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
4948
5049# ... and replace it with the new one.