Commit graph

585 commits

Author SHA1 Message Date
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Pascal Wittmann eca518109c
hyper-haskell-server-with-packages: add version to name
see issue #43717
2018-07-20 23:07:16 +02:00
Pascal Wittmann c01411f109
leksah: include version in name
see issue #43717
2018-07-19 21:55:04 +02:00
Peter Simons 3e3a860c88 multi-ghc-travis: update to latest git version 2018-07-12 10:21:32 +02:00
Peter Simons eee50238c7 multi-ghc-travis: update to current git HEAD 2018-06-25 17:00:02 +02:00
Ben Gamari f8cef0d06e multi-ghc-travis: db63eb7f2ea -> 05926968f17 (#42171)
Just a routine bump; adds support for GHC 8.4.3.
2018-06-18 22:38:07 +02:00
Kirill Elagin 43a62b66d0 ihaskell: Do not unset $PATH in the wrapper 2018-06-08 16:32:59 +02:00
Peter Simons f8e77b3373 multi-ghc-travis: patch to support latest ShellCheck version 2018-06-06 18:29:50 +02:00
Peter Simons 8ad1476755 multi-ghc-travis: update to latest git version for ghc-8.4.3 support 2018-05-31 21:19:57 +02:00
Peter Simons 7edfd9dbe1 multi-ghc-travis: update to git head from 2018-05-22 2018-05-30 12:53:07 +02:00
Peter Simons dd2b5b9400 multi-ghc-travis: update to latest git version from May 16th 2018-05-17 15:25:28 +02:00
Peter Simons 12ba3954d7 multi-ghc-travis: update to latest git version 2018-04-27 12:21:24 +02:00
Peter Simons 2206adb4cd multi-ghc-travis: update to latest git version 2018-04-09 16:47:46 +02:00
Matthew Justin Bauer 68f6915083
Merge branch 'master' into hyper-haskell 2018-03-22 11:29:45 -05:00
Peter Simons 1c0126a26d multi-ghc-travis: update to latest version
And jailbreak to support building in an lts-11.x package set.
2018-03-16 17:29:53 +01:00
Peter Simons 8dcd7f0d85 multi-ghc-travis: update to latest git version 2018-03-09 14:29:13 +01:00
Peter Simons b7e3c4ee65 multi-ghc-travis: update upstream repository URL 2018-02-21 11:12:31 +01:00
Joachim F 4692a2d00e
Merge pull request #34450 from puffnfresh/lambdabot/hoogle
lambdabot: add Hoogle
2018-02-17 07:27:26 +00:00
Peter Simons afb83e0e03 multi-ghc-travis: update to current Git master 2018-02-13 10:57:40 +01:00
Brian McKenna 5877cfb9ce lambdabot: add Hoogle 2018-01-31 22:33:21 +11:00
Peter Simons 03ef28473d haskell-tinc: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons c83b455c7d haskell-intero-nix-shim: drop broken non-Hackage package 2018-01-26 13:01:11 +01:00
Peter Simons 29f0f38433 multi-ghc-travis: update to latest Git version and create a proper Haskell build
The attribute haskellPackages.multi-ghc-travis refers to a proper Cabal build
that includes the package's library
2018-01-18 17:01:33 +01:00
Daiderd Jordan 0127cf06c5
vaultenv: remove meta.broken 2018-01-07 09:33:57 +01:00
Daiderd Jordan 3b4bbd2121
Merge pull request #33205 from LnL7/vaultenv-0.5.3
vaultenv: 0.5.0 -> 0.5.3
2018-01-07 09:32:34 +01:00
Daiderd Jordan b124cdc6b6
vaultenv: 0.5.0 -> 0.5.3 2017-12-30 16:53:51 +01:00
Peter Simons a05d950812 haskell-intero-nix-shim: build is broken 2017-12-30 13:53:05 +01:00
Peter Simons 8128c17d44 haskell-vaultenv: build is broken due to "optparse-applicative <0.14" dependency
Ping @lnl7.
2017-12-30 13:53:04 +01:00
Vaibhav Sagar d341d28401 ihaskell/wrapper.nix: unify ihaskellEnv and ihaskell
Having both `ihaskell` and `ihaskellEnv` is redundant, and might even
cause problems if the two differ somehow.
2017-11-08 23:19:16 +08:00
Vaibhav Sagar eece8755d1 ihaskell: re-enable 2017-11-06 09:58:28 +01:00
Peter Simons d0e8806494 haskell-tinc: mark build as broken
https://hydra.nixos.org/build/62246306
2017-10-09 17:25:57 +02:00
Daiderd Jordan c3f6b53bb6
vaultenv: init at 0.5.0 2017-09-09 12:43:04 +02:00
Peter Simons 91054336ce multi-ghc-travis: update to latest git head 2017-08-31 21:42:55 +02:00
Rodney Lorrimar bda5815851 hyper-haskell: init at 0.1.0.2 2017-08-05 13:54:58 +01:00
John Ericson 74f5fe5068 haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

 - stdenv is exposed more shallowly so it can be overriden more easily.
   I'll eventually use this on Darwin to avoid the Sierra shared
   library problems (unless changes are to be made system-wide).

Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-03 13:12:01 +02:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Peter Simons 28c01703f0 haskell: remove all code related to the "haste" compiler
These packages have been broken for a while and now they don't even evaluate
any more.
2017-07-26 10:20:30 +02:00
Peter Simons ea63fd4eb0 multi-ghc-travis: update to latest git version
I used an incorrect date for the version field in my last commit, so now I have
to date this slightly into the future to make sure the new version actually
looks newer to Nix, too.
2017-07-25 18:53:03 +02:00
Peter Simons 83fe3f0268 multi-ghc-travis: update to current Git master 800980d76f7a74f3 2017-07-20 09:15:47 +02:00
Peter Simons b9ed1177c8 haskell-tinc: enable Hydra builds 2017-07-04 15:50:26 +02:00
Peter Simons b683a15d17 haskell-tinc: don't hard-code the version of GHC used by this tool
We don't want to re-compile tinc just to change the GHC environment used for
building, i.e. when running inside of nix-shell. Instead, find "ghc" in $PATH.
2017-07-04 15:50:26 +02:00
Peter Simons cafed1a84c haskell-tinc: update to latest git version to fix the build 2017-07-04 15:50:26 +02:00
Peter Simons fbb5b2ef01 multi-ghc-travis: update to latest git version 2017-06-09 09:23:36 +02:00
Peter Simons 769e14a422 multi-ghc-travis: update to latest git version and install both scripts
We're using the names 'make-travis-yml' and 'make-travis-yml-2' now, which
feels more in-line'ish with the Cabal file hvr is distributing.
2017-05-19 09:26:28 +02:00
Michal Rus 6aefa13156
intero-nix-shim: fix runtime dependencies 2017-05-07 02:20:17 +02:00
Michal Rus 9925c5c9b1
intero-nix-shim: init at 0.1.2 2017-05-03 23:36:02 +02:00
Robbin C 256c4003e4 haskellPackages.tinc: 20161119 -> 20170228 2017-02-28 21:39:34 +08:00
Robin Gloster cb6490fc76 Revert "Mark ihaskell as broken. Closes #22047." 2017-01-27 12:38:44 +01:00
Tom Hunger 6dd5c9de73 Mark ihaskell as broken. Closes #22047.
meta.broken doesn't work in buildEnv so we abort when the dependencies
are evaluated.

See bug for more context.
2017-01-27 11:34:34 +01:00
Robbin C 8a89d89352 haskellPackages.tinc: 20161102 -> 20161119 2017-01-21 11:58:25 +08:00
William Casarin dfb354ea7d multi-ghc-travis: git-2015-11-04 -> git-2016-10-23 (#20754)
adds support for ghc8
2016-11-28 03:24:51 +01:00
Robbin C accd0728d8 haskellPackages.tinc: 20160924 -> 20161102 2016-11-02 22:44:38 +08:00
Robbin C 5c5c059912 tinc: 20160511 -> 20160924
Fix broken build.
2016-09-27 01:09:45 +08:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Peter Simons 4d11900a43 haskell-tinc: hydra builds fail 2016-07-21 13:54:35 +02:00
Peter Simons 6a6b8fa36f cabal2nix: update to version 2.0 from Hackage
I've realized that publishing updates to Hackage is far easier than
publishing updates in Nixpkgs, and since all Hackage updates show up in
Nix automatically I've decided to go back to publishing cabal2nix on
Hackage again.

Unfortunately, this means that I'll have to change the version numbering
scheme to comply with the expectations of the Haskell PVP (which is used
by Stackage), so the new version 2.0 looks like a downgrade to Nix,
which used to have version 20160406. :-(

If in doubt, run "nix-env -u --always" to force the update. I am sorry
about the inconvenience.
2016-07-05 23:45:41 +02:00
Peter Simons a7e33a1a1e cabal2nix: update to version 20160613-10-g57dddc7 2016-07-01 12:01:03 +02:00
Peter Simons 322fe543b6 cabal2nix: bump to version 20160613 2016-06-13 23:09:55 +02:00
Peter Simons 22ae90ae90 cabal2nix: update to version 20160611 2016-06-12 08:37:06 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
robbinch db7bf64e31 haskellPackages.tinc: 20160419 -> 20160511 (#15457) 2016-05-15 00:28:59 +02:00
Peter Simons cf4a69e2ec haskell-tinc: move the tool into the haskellPackages hierarchy like all other Haskell packages 2016-04-24 20:13:27 +02:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
obadz c3860bf008 haskellPackages.haste-compiler: fix build issue in #14581 2016-04-11 17:21:18 +01:00
obadz 7f2163fc97 haskellPackages.haste-compiler: fix so that it now builds and runs
Required adding:
haskellPackages.haste-Cabal, and
haskellPackages.haste-cabal-install
2016-04-11 15:24:56 +01:00
Peter Simons 3110ba445f cabal2nix: update to version 20160406 2016-04-07 07:53:57 +02:00
Peter Simons 588a237e9e cabal2nix: update to version 20160308 2016-03-08 17:55:04 +01:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Peter Simons 16e9b44afa cabal2nix: update to version 20151217 2015-12-18 11:37:44 +01:00
William Casarin bc698428aa multi-ghc-travis: init at git-2015-11-04 2015-11-29 17:39:34 -08:00
Edward Tjörnhammar c351c22db5 ihaskell: make sure the wrapped binaries pick up the python path 2015-09-28 21:26:17 +02:00
Peter Simons 5c1afdd5f6 cabal2nix: update to version 20150922 2015-09-23 15:08:19 +02:00
Peter Simons 6b682a9e37 haskell-language-nix: pull this library in from Hackage 2015-09-11 10:28:30 +02:00
Peter Simons f6fd6defa5 haskell-nix-paths: pull the library in from Hackage now that it's been published 2015-09-11 10:28:30 +02:00
Peter Simons 1e5e17eeac haskell-nix-paths: initial version 1 2015-09-09 11:31:14 +02:00
Nikolay Amiantov 57c33c1c54 lambdabot: rework custom modules and configuration 2015-09-08 17:50:55 +03:00
Peter Simons ca9158fa82 cabal2nix: fix version number 20180903 to 20150903
Thanks to @drvink for pointing this out.
2015-09-07 23:35:45 +02:00
Peter Simons 06a7b22985 cabal2nix: fix https://github.com/NixOS/cabal2nix/issues/203 some more 2015-09-07 17:34:59 +02:00
Peter Simons d4f7bf9c29 cabal2nix: re-generate the build files to make sure all dependencies are listed correctly
Fixes https://github.com/NixOS/cabal2nix/issues/203.
2015-09-07 16:03:28 +02:00
Peter Simons 65a415a1b2 cabal2nix: update to version 20180903 2015-09-03 17:53:24 +02:00
Peter Simons ada81b80fd cabal2nix: update to version 20150824-66-gd281a60
This patch fixes https://github.com/NixOS/nixpkgs/issues/9599.
2015-09-02 17:46:39 +02:00
Peter Simons b2c3c58476 cabal2nix: add myself as a maintainer 2015-08-30 12:49:45 +02:00
Aycan iRiCAN 523cd395c7 cabal2nix: fixed sha256 hash 2015-08-30 11:47:25 +03:00
Peter Simons b106fbfb4f cabal2nix: update to version 20150824 2015-08-25 17:15:41 +02:00
Aycan iRiCAN afe6f05310 cabal2nix: fixed sha256 hash
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
2015-08-22 11:04:09 +03:00
Peter Simons 3dbfcdc3d4 cabal2nix: make the package visible from the top-level
This means that "nix-env -i cabal2nix" suffices to install this package.
2015-08-07 23:08:13 +02:00
Peter Simons 13dc24f5c3 cabal2nix: update to version 20150807-6-g9f58996
The generated shell.nix file accepts a string argument called "compiler" that
determines the package set used to instantiate the generated expression. For
example, running "nix-shell --argstr compiler ghc7102" would evaluate the build
inside of "pkgs.haskell.packages.ghc7102". Earlier versions of cabal2nix had the
current default compiler hard-coded in the expression, but after this change this
is no longer the case. When "compiler" remains unspecified, it defaults to
"default", and this value causes evaluation in "pkgs.haskellPackages", which is
the package set most people would like to use by default. That change has to
benefits:

 1) Generated expression no longer contain any particular compiler version. The
    choice of the default compiler depends on the version of Nixpkgs that's used
    to build the expression.

 2) When the default compiler is used, overrides configured for the default
    package set apply, which was not the case in earlier versions.
2015-08-07 23:08:13 +02:00
Peter Simons 29fed6f834 cabal2nix: update to version 20150807
This update greatly enhances the accuracy with which dependencies are expressed
in the generated Nix files. Previous versions distinguished dependencies for
building ("buildDepends") and testing ("testDepends"). This distinction didn't
apply to system packages or build tools, however: the fields "extraLibs" and
"buildTools" applied to the entire build. This meant that dependencies required
only for testing would be pulled in regardless of whether the test were
actually being run, etc.

These days, we distinguish dependencies for libraries, executables, and tests,
and for each of those types we distinguish dependencies on Haskell libraries,
system libraries, pkgconfig libraries, and build tools. This gives us a
whopping 12 new attributes

    xxxHaskellDepends
    xxxSystemDepends
    xxxPkgconfigDepends
    xxxToolDepends

where "xxx" is any of "library", "executable", or "test".

The old dependency attributes are no longer generated by cabal2nix. The generic
builder in Nixpkgs still accepts them, though, for the sake of backwards
compatibility. This means that you don't have to re-generate all your build
expressions with the new version, but you *should*.
2015-08-07 15:03:58 +02:00
Peter Simons 4d404fd6a4 ihaskell-wrapper: avoid use of /bin/sh
https://github.com/NixOS/nixpkgs/issues/183
2015-06-12 10:50:40 +02:00
Peter Simons 7acb77ca2b cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag 2015-06-05 12:42:34 +02:00
Peter Simons c659105ef8 cabal2nix: get rid of the '-dirty' version suffix
The fetchgit builder performs some freak magic in the name of deterministic
hashes that screws up git's idea of a clean directory tree.
2015-06-04 13:33:57 +02:00
Peter Simons c55ca3fd0b cabal2nix: update to version 20150531
This update adds support for bash completion.
2015-05-31 18:31:26 +02:00
Peter Simons d808f5b3e6 cabal2nix: update to version 20150525 2015-05-25 15:00:07 +02:00
Peter Simons 61224338ff cabal2nix: update to version 20150518 2015-05-18 18:04:37 +02:00
Peter Simons ea3b8cd918 cabal2nix: update to version 20150505 2015-05-05 21:44:48 +02:00
Peter Simons 11bf7502cc Remove obsolete entries from pkgs/development/tools/haskell. 2015-05-04 12:27:02 +02:00
Peter Simons cde5088bec cabal2nix: the hash has changed because of the newly added tag 2015-04-23 19:55:55 +02:00
Peter Simons 019b18722d cabal2nix: bump to latest version and wrap it to include nix-prefetch-scripts in $PATH 2015-04-23 14:12:43 +02:00
Nikolay Amiantov 91f3912b5d lambdabot: add configuration 2015-04-20 18:56:43 +03:00