alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
214923 commits 217 branches 121 tags 4.5 GiB
Commit graph

4649 commits

Author SHA1 Message Date
Jacquin Mininger 7d67db3919 shellFor: Refactor for consistency and cross 
This makes it work like work-on-multi from Reflex Platform. In
particular, rather than making `.env` from `shellFor`, we make `.env`
the primitive, and `shellFor` works by combining together the arguments
of all the packages to `generic-builder` and taking the `.env` of the
resulting mashup-package.

There are 2 benefits of this:

1. The dependency logic is deduplicated. generic builder just concatted
   lists, whereas all the envs until now would sieve apart haskell and
   system build inputs. Now, they both decide haskell vs system the same
   way: according to the argument list and without reflection.
   Consistency is good, especially because it mean that if the build
   works, the shell is more likely to work.

2. Cross is handled better. For native builds, because the
   `ghcWithPackages` calls would shadow, we through both the regular
   component (lib, exe, test, bench) haskell deps and Setup.hs haskell
   deps in the same `ghcWithPackages` call. But for cross builds we use
   `buildPackages.ghcWithPackages` to get the setup deps. This ensures
   everything works correctly.
 2020-01-17 10:46:29 -05:00
John Ericson ba9066abca Merge together merge bases of 19.09 and master 2020-01-15 18:54:36 -05:00
Peter Simons 29e871b2d0 haskell-krank: jailbreak to fix the build 2020-01-10 21:02:44 +01:00
Peter Simons 0685be711e git-annex: update sha256 hash for version 7.20191230 2020-01-10 20:56:20 +01:00
Peter Simons 4ef37f4210 haskell-hoogle: drop obsolete jailbreak 
The latest version of hoogle accepts haskell-src-exts-1.23.x.
 2020-01-10 20:56:20 +01:00
Peter Simons 7b8cdfabcd haskell-pandoc: update ghc-8.8.x override for the latest version 2020-01-10 20:56:20 +01:00
Peter Simons 1886028a3c haskell-tls: update ghc-8.8.x override for the latest version 2020-01-10 20:56:20 +01:00
Peter Simons 2c1f974db5 hackage2nix.yaml: update the comment that documents 'default-package-overrides' 2020-01-10 20:56:20 +01:00
(cdep)illabout d11d55fd62 haskell: add comment to default-package-overrides in configuration-hackage2nix.yaml. 2020-01-10 20:56:20 +01:00
Merlin Göttlinger 900a378245 haskell: add quickjump option to the haskell mkDerivation 
When visiting local documentation via hoogle, currently for most packages the
quickjump index is missing so you only get a sad error when pressing "s" to
search in the current documentation.

The quickjump option is only supported by the haddock utility that's shipped
with ghc 8.6.x or later.

Closes https://github.com/NixOS/nixpkgs/pull/75942.
 2020-01-10 20:56:20 +01:00
Peter Simons d8cf98b9c8 haskell-src-exts: update overrides for the new 1.23.0 version 2020-01-10 20:56:20 +01:00
Brian Hicks dfa9d013e7 postgresql-typed: disable test suite 
the test suite requires a running PostgreSQL instance to complete
successfully, so we'll just skip that.
 2020-01-10 20:56:20 +01:00
Peter Simons 2514bddbf7 ghc-8.10.x: exceptions is now a core library that comes with the compiler 2020-01-10 20:56:19 +01:00
Peter Simons 2447c661d9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
e75b27b8d5.
 2020-01-10 20:56:08 +01:00
Marek Fajkus efa816ab60 haskellPackages.hakyll-sass: unmark broken 2020-01-10 20:56:07 +01:00
Aditya Manthramurthy cf2df51313 haskellPackages.webby: mark unbroken 
Builds fine now.
 2020-01-10 20:56:07 +01:00
Peter Simons dbe97c772e hackage2nix: update list of broken builds 2020-01-10 20:56:07 +01:00
Peter Simons 323fe92057 LTS Haskell 14.20 2020-01-10 20:56:07 +01:00
Peter Simons 4a2aad0d39
Revert "haskell/with-packages-wrapper.nix: install "doc" outputs" 2020-01-10 15:20:08 +01:00
Alexander Foremny 9e808578c4 haskellPackages.ormolu: mark unbroken 
Builds fine with 6b5bb4261c6dacbe65d348376c416c75ddafaebd
 2020-01-10 14:54:33 +01:00
Alexander Foremny 47ddee700f haskellPackages.ormolu: fix overrides so it builds 2020-01-10 14:54:33 +01:00
Matthew Bauer ddcaa0cd2f
Merge pull request #76842 from matthewbauer/add-doc-to-ghc-wrapper 
haskell/with-packages-wrapper.nix: install "doc" outputs
 2020-01-07 00:23:15 -05:00
Matthew Bauer 93aabab760 haskell/with-packages-wrapper.nix: remove /bin symlink if it exists 
The wrapper need a writable directory to work, so remove the symlink
to a read-only one if it occurs.
 2020-01-06 18:25:50 -05:00
Peter Simons f2a218df59 git-annex: temporarily drop support for bup some more 2020-01-05 15:31:16 +01:00
Peter Simons f172a19e79 git-annex: temporarily drop support for bup 
The build is currently broken [1] and therefore blocks git-annex.

[1] https://github.com/NixOS/nixpkgs/issues/76979
 2020-01-05 15:13:29 +01:00
Matthew Bauer e915608618 haskell/with-packages-wrapper.nix: install "doc" outputs 
We were previously just installing the "out" output which broke when
we recently changed to generating multiple outputs.

Fixes #76837
 2020-01-02 16:12:46 -05:00
Frederik Rietdijk 555037a667 Merge master into staging-next 2019-12-31 16:35:53 +01:00
John Ericson cfd013813e
Merge pull request #74090 from obsidiansystems/ghcjs-cross-without-cc 
stdenv, haskell: bonafied GHCJS cross compilation without stdenv.cc
 2019-12-30 16:40:43 -08:00
Robin Gloster f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Alexandre Esteves af2eaec41a haskellPackages.multi-ghc-travis: add missing space (PR #76648) 2019-12-29 19:27:25 +01:00
Peter Simons 525b8cd3f6 ghc: add 8.10.1-alpha2 2019-12-27 20:58:23 +01:00
Peter Simons fdd64fbc37 haskell-servant-{ekg,blaze}: jailbreak to fix the build 2019-12-27 20:37:13 +01:00
Peter Simons 4d403a3a51 haskell-ghcide: drop broken overrides 
We made an effort to support ghcide in Nixpkgs, but the complexity of the
problem is a bit too high, IMHO. We need to keep older versions of several
packages around in order to satisfy the build requirements, and some of those
older packages don't even build themselves (like hie-bios). We had ghcide
working at some point, but then it was broken again right away after a couple
of days. I fear that we'll run into that issue again and again with a setup of
that complexity.

Instead, I'd propose that we work with upstream to fix their build, i.e. let's
make sure that the proper ghcide build works with recent versions of its build
inputs.

Closes https://github.com/NixOS/nixpkgs/pull/75449.
Closes https://github.com/NixOS/nixpkgs/pull/76103.
 2019-12-27 20:37:13 +01:00
Peter Simons 4979823e46 git-annex: update sha256 hash for version 7.20191218 2019-12-27 20:37:13 +01:00
Peter Simons dbcb34900a haskell-lsp-test: update override to the latest version 2019-12-27 20:37:13 +01:00
Peter Simons 6010ce05b7 pandoc: update override for the ghc-8.8.x to the latest version 2019-12-27 20:37:13 +01:00
Dmitry Kalinkin c744527e3e gitAndTools.git-annex: fix darwin build 
Closes: #76342
Fixes: #73435
 2019-12-27 20:37:13 +01:00
(cdep)illabout b7a5df05c3 spago: 0.12.1.0 -> 0.13.0 2019-12-27 20:37:13 +01:00
(cdep)illabout 54fad88234 haskellPackages.dhall_1_27_0: fix build 2019-12-27 20:37:13 +01:00
Merlin Göttlinger 693b68be7f haskell-lsp: Added 0.18.* to extra-packages for ghcide 2019-12-27 20:37:13 +01:00
(cdep)illabout db1adfe3c8 haskellPackages.dhall_1_28_0: fix overrides so it builds 
This PR fixes dhall_1_28_0, dhall-bash_1_0_25, and dhall-json_1_6_0 so
they build.

They all require a newer version of prettyprinter than we get from the
LTS package set.

This is from https://github.com/NixOS/nixpkgs/pull/75931 by @ijaketak.

Co-authored-by: Keito Kajitani <ijaketak@gmail.com>
 2019-12-27 20:37:13 +01:00
Matt McHenry 9f053666ae haskellPackages.snap-server: patch for network >= 3.0 2019-12-27 20:37:13 +01:00
Robert Djubek 0787a562c4 glirc: init at 2.33.1 
haskellPackages.glirc is a "Console IRC Client." I've added a doJailbreak
to fix the build (thanks @infinisil) and added it to top-level/all-packages.nix
so people can find and install it as they would normally.

Would be nice to make this build in a way that allows the OTR extension to be
enabled. One thing at a time....
 2019-12-27 20:37:13 +01:00
Peter Simons 42e51bd42e hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.0-11-g2fb6f7e from Hackage revision
16e46fea2e.
 2019-12-27 20:37:03 +01:00
(cdep)illabout 753a0d3f72 haskellPackages.dhall_1_27_0: generate this package 
This adds dhall-1.27.0 to extra-packages in
configuration-hackage2nix.yaml.

dhall-1.27.0 is used by spago, so this package needs to be available.
 2019-12-27 20:37:01 +01:00
Peter Simons 992de916ce hackage2nix: disable broken builds 2019-12-27 20:35:33 +01:00
Aditya Manthramurthy aaf838d095 haskellPackages.postgresql-simple-url: mark unbroken 
Builds fine now.
 2019-12-27 20:35:33 +01:00
(cdep)illabout c1be286ca2 haskellPackages.stack2cabal: mark unbroken 2019-12-27 20:35:33 +01:00
Peter Simons b77ed68156 LTS Haskell 14.18 2019-12-27 20:35:33 +01:00
Peter Simons 3e2e061529 structured-haskell-mode: update github repo location 2019-12-27 18:42:56 +01:00
Peter Simons c2ba83e98a haskell-descriptive: use the proper release version instead of the one from git 
The released version has all the fixes we needed.
 2019-12-27 18:37:42 +01:00
John Ericson 9cbbe2b00f Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 14:36:13 -05:00
John Ericson d8dd301412 haskell generic-builder: Hack so CPP without a CC works 2019-12-25 14:34:40 -05:00
John Ericson 49daa0aa64 Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 13:17:00 -05:00
John Ericson 6a23c9ddbe haskell generic-builder: Fix --with-ghc flag for GHCJS as cross 
Otherwise it passes `--with-ghc=ghc`, and we do the wrong thing.
 2019-12-25 13:14:48 -05:00
John Ericson a8bd27b454 Merge branch 'ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc 2019-12-25 01:31:35 -05:00
John Ericson ad93663a48 ghcWithHoogle: Fix for cross 
Use `buildPackages.stdenv.mkDerivation` because we are making a shell
script to start hoogle on the build platform.
 2019-12-24 18:17:41 -05:00
Niklas Hambüchen 4bf23ce6f9 haskellPackages.GLUT: Fix freeglut.pc -> glut.pc. 
This was broken by PR #70235 with commit

    f5ae5cac - freeglut: 3.0.0 -> 3.2.1

The in the newer freeglut version, the pkg-config file is called
`glut.pc`, no longer `freeglut.pc`.

Found in:

    https://github.com/NixOS/nixpkgs/pull/70235#issuecomment-567536852
 2019-12-20 02:52:54 +01:00
Peter Simons 9c01e123d6 haskell-src-meta: update ghc-8.8.x build to the latest version 
This allows us to build the package without the need for
patching. The test suite still doesn't compile unfortunately.

Closes https://github.com/NixOS/nixpkgs/pull/75594.
 2019-12-13 20:48:35 +01:00
Peter Simons 69e794d1d8 haskell-pandoc: update the ghc-8.8.x build to version 2.9 2019-12-13 20:48:35 +01:00
Manuel Bärenz bd11e12fcc haskell-clay: unbreak the build; it succeeds fine 2019-12-13 20:48:14 +01:00
Peter Simons 2d94437a32 haskell-doctemplates: update override for ghc-8.8.x 2019-12-13 20:48:13 +01:00
Peter Simons c02f1b47cd hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision
df9ca29882.
 2019-12-13 20:48:13 +01:00
Peter Simons d5814bc0e6 haskell-ghcide: use latest haskell-lsp versions 
ghcide needs version 0.18.x of the haskell-lsp package to build.

Closes https://github.com/NixOS/nixpkgs/pull/75610.
 2019-12-13 20:48:13 +01:00
sternenseemann 1fef36e671 haskell-spacecookie: use correct version of systemd to fix the build 2019-12-13 20:46:29 +01:00
sternenseemann e449a21f19 haskell-systemd: use correct version of network to fix the build 2019-12-13 20:46:29 +01:00
Peter Simons 82d49ffa82 hackage2nix: disable broken builds 2019-12-13 20:46:29 +01:00
Peter Simons c01e7b9703 LTS Haskell 14.17 2019-12-13 20:45:44 +01:00
Peter Simons 53dca0d451 haskell-hlint: update override for ghc-lib-parser to the latest version 2019-12-06 20:55:12 +01:00
Peter Simons 88179304b4 haskell-brick: use the latest version when building with ghc-8.8.x 2019-12-06 20:55:12 +01:00
Peter Simons fc8ccfa780 haskell-dhall: update overrides for the latest version 2019-12-06 20:55:12 +01:00
Peter Simons cd9816e0f7 haskell-pandoc: update ghc-8.8.x override for the latest version 2019-12-06 20:55:12 +01:00
Peter Simons 66285b7ab7 haskell-vty: use latest version when building with ghc-8.8.x 2019-12-06 20:55:12 +01:00
Peter Simons 09186816b1 haskell-regex-tdfa: update override for ghc-8.8.x 2019-12-06 20:55:12 +01:00
Peter Simons fa1a064694 haskell-monad-par: enable test suite again 2019-12-06 20:55:12 +01:00
Peter Simons 0db312b2f1 ghc-8.8.x: update package versions to fix builds 2019-12-06 20:55:12 +01:00
Peter Simons 6f1dae65f7 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision
d33af9cc10.
 2019-12-06 20:55:06 +01:00
Peter Simons bb0cf7ffb3 hackage2nix: update list of broken packages 2019-12-06 20:26:41 +01:00
Henri Jones eb621046a7 haskellPackages.sbv: remove from list of broken packages 2019-12-06 20:26:40 +01:00
Peter Simons 6b362fd020 ghc-8.8.x: update package versions to fix builds 2019-12-05 14:44:05 +01:00
Peter Simons d8ab6c90ce haskell-haddock-library: jailbreak version 1.8.0 so that we can build the test suite 2019-12-03 12:56:52 +01:00
Peter Simons 2c5b9702ef haskell-prettyprinter: use latest version when building with ghc-8.8.x 2019-12-03 11:45:29 +01:00
Frederik Rietdijk d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
Peter Simons 2ad2f5ac18 haskell-pandoc et al: use the latest package versions for ghc-8.8.x 2019-11-29 21:51:32 +01:00
Peter Simons 851bc13b6e haskell-dns: disable test suite to fix the build 2019-11-29 21:51:32 +01:00
Peter Simons 0d003266b0 haskell-HaTeX: disable test suite to fix the build 2019-11-29 21:51:32 +01:00
Peter Simons 5f3638bfda haskell-cabal-plan: update overrides for the new version 2019-11-29 21:51:32 +01:00
Peter Simons 6f39f705f4 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision
1011c4cc9b.
 2019-11-29 21:51:28 +01:00
Peter Simons c335226cee haskell-ci: mark broken (and drop obsolete overrides) 
The build requires Cabal 3.x at setup-time and I can't make
it work easily for reasons I don't understand. Fixing that
package is going to need more time.
 2019-11-29 21:51:00 +01:00
Peter Simons b744d1f88a hackage2nix: update list of broken packages 2019-11-29 21:51:00 +01:00
anticris ccd9bbf807 remove pandoc-placetable from broken packages section 2019-11-29 21:51:00 +01:00
gnidorah 54564b0233 haskellPackages.hakyll-images: unmark as broken 2019-11-29 21:51:00 +01:00
Peter Simons e449a61c39 LTS Haskell 14.16 2019-11-29 21:51:00 +01:00
(cdep)illabout bb104abf63 spago: init at 0.12.1.0 
This commit adds the spago package, a PureScript package manager and build tool.

https://github.com/spacchetti/spago
 2019-11-29 10:13:35 +09:00
John Ericson 6bc456c91c Merge remote-tracking branch 'upstream/master' into ghcjs-cross-without-cc 2019-11-25 00:23:07 +00:00
John Ericson ea9a2c5ec2 haskell genenric-builder: Make the C compiler optional 
This is GHCJS, and perhaps other obscure targets.
 2019-11-25 00:12:39 +00:00
Frederik Rietdijk 10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Jack Kelly 9f41d8a9d0 callHackageDirect: correct type signature 2019-11-20 16:36:33 +10:00
Frederik Rietdijk 5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00