mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Code Issues Wiki Activity
127945 commits 191 branches 125 tags 8.1 GiB
Commit graph

53 commits

Author SHA1 Message Date
Vladimír Čunát 1fcd92ce92
Merge branch 'master' into staging 
A few thousand rebuilds from master, again.
Hydra: ?compare=1422362
 2017-12-31 09:53:49 +01:00
Nick Hu 47c1711f68 llvm-hs: fix llvm-config dependency 2017-12-29 22:38:27 +00:00
Vladimír Čunát a1a3e54ac9
Merge branch 'master' into staging 
Haskell rebuild :-)
Hydra: ?compare=1421865
 2017-12-29 18:39:36 +01:00
Rickard Nilsson 1de251c664 haskellPackages.LDAP: Fix build 2017-12-29 11:42:20 +01:00
Robin Gloster ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Orivej Desh d3a375fe58 haskell-configuration-nix: fix eval 2017-12-20 09:50:21 +00:00
Peter Simons 1c0c6d80e7 haskell-configuration-nix: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons d323c38082 haskell-htoml-megaparsec: update override for latest megaparsec version 2017-12-19 13:58:52 +01:00
Peter Simons bd0f541dbb haskell-colour: disable test suite to avoid infinite recursion 2017-12-15 13:11:16 +01:00
Peter Simons 8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Nicholas Clarke d90165c7db Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"" 
This reverts commit 89f5d52cf4.
 2017-11-27 16:05:22 +00:00
Peter Simons a7144523cf haskell-partial-semigroup: break cyclic reference that results in an infinite recursion 2017-10-17 20:35:29 +02:00
Michael Alan Dorman 11efabe29c htoml-megaparsec: build against newest megaparsec 2017-10-12 18:53:27 +01:00
Domen Kožar 61fbdb47a6
haskellPackages.foundation: disable tests on darwin 2017-09-26 19:00:27 +02:00
Ben Ford 94ba1c02f6 Change link in explanation to upstream issue 2017-09-08 13:45:56 +01:00
Ben Ford 30ce53d105 Add a note about the changes 2017-09-08 13:13:22 +01:00
Ben Ford 017a356082 Also had to add dontCheck integration test seems to hang 
(unit tests all pass)
 2017-09-08 13:08:26 +01:00
Ben Ford 3205d164c6 Fix hw-kafka-client haskell package 2017-09-08 12:31:02 +01:00
Peter Simons 89f5d52cf4 Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out" 
This reverts commit dfb0f25484, reversing
changes made to 7f8ff02437. These changes broke
the ghcWithPackages wrapper:

    nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
    /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
        (no packages)
 2017-09-06 10:19:18 +02:00
Daiderd Jordan d0d905668c
haskell-hscolour: fix darwin build 2017-09-05 22:56:09 +02:00
Nicholas Clarke eb99d3a670 Fix git-annex. 2017-09-04 12:35:58 +01:00
Nicholas Clarke 414a557904 Add specific overrides for a number of failing packages. 
Finish overriding bin output for broken packages.

Put stack bash completions in $bin.
 2017-09-04 12:35:58 +01:00
Nicholas Clarke a1d78fa5bc Don't build separate bin output for alex. 
It has files in /usr/share which reference the bin output.
 2017-09-04 12:35:57 +01:00
Daiderd Jordan d491eebffd
haskell-packages: fix evaluation 2017-08-17 22:43:15 +02:00
Domen Kožar 4f80406fdd Merge pull request #27615 from NickHu/cuda 
fix haskellPackages.cuda and some tools dependent on cudatoolkit
 2017-08-07 16:13:49 +02:00
Domen Kožar 71bebd5254
{fs,h}notify: move to configuration-nix.nix 2017-08-06 10:42:37 +02: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
Nick Hu 34beeac70b fix haskellPackages.cuda and some tools dependent on cudatoolkit 2017-07-24 16:55:11 +01:00
Peter Simons 85a70b50b9 haskell-hledger-iadd: drop obsolete override (the build fails with or without it) 2017-07-17 22:04:25 +02:00
Peter Simons 47feb45313 haskell-hsyslog: update version override 
And move it from configuration-nix to configuration-common.
 2017-07-17 22:04:25 +02:00
Peter Simons 78377ae5cf haskell: fix builds of hledger-iadd, opencv-extra, and logging-facade-syslog 2017-06-29 17:35:44 +02:00
Frederik Rietdijk 8a62a9b064 Merge pull request #26125 from volth/webkitgtk-naming 
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
 2017-06-28 13:54:38 +02:00
Peter Simons d83fb640db haskell-opencv: ensure that the underlying C++ library has contrib code enabled 
0335b93284 (commitcomment-22638850)
 2017-06-23 12:49:36 +02:00
Peter Simons 33b4a6853e liquidhaskell: try fix test suite 
This almost succeeded, but some minor issues remain.
 2017-05-27 10:33:37 +02:00
Peter Simons 2c2965c395 liquid-fixpoint: disable shared executables to fix the test suite 
The test suite runs "fixpoint" in an environment where the required library
search paths aren't set up properly.
 2017-05-27 10:32:49 +02:00
Peter Simons bf09054ff0 liquid-fixpoint: patchShebangs is no longer required in version 0.6.0.1 2017-05-27 10:32:49 +02:00
Volth b7ccf27229 rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2 2017-05-26 13:43:25 +00:00
Peter Simons 890fd54fde haskell-loc-test: break infinite recursion in test dependencies 2017-05-12 09:25:25 +02:00
Ryan Trinkle 1927361e44 gi-webkit2: fix gi-javascriptcore dependency 2017-05-01 15:21:57 -04:00
Peter Simons f4ed1f98d1 haskell-gtksourceview: clean up overrides for versions 2 and 3 of the package 2017-04-21 16:25:53 +02:00
Luke Clifton 5ffece7de1 llvm-hs: Point llvm-hs to llvm_4 2017-04-05 16:51:45 +08:00
Peter Simons d59fe189fd haskell-configuration-nix: drop obsolete webkit-related overrides 2017-03-20 10:24:58 +01:00
Benno Fünfstück 6c99f88eec fix typo in comment 2017-03-12 22:47:28 +01:00
Benno Fünfstück 039c6a6dfa haskell: comment about configuration-nix.nix's intersectAttrs 2017-03-12 22:45:19 +01:00
Vladimír Čunát 69448187a4
haskellPackages.llvm-general-darwin: fix #23794 
by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.
 2017-03-12 18:19:35 +01:00
Michael Alan Dorman 763e21e982 haskell-gi-base: propagate gobjectIntrospection dependency 
So the thinking is: anything that needs `haskell-gi-base` is going to
need `gobjectIntrospection` in order to work correctly; by adding this
one `buildDepends` (which therefore gets propagated), we put ourselves
in a position to simplify away a bunch of code in `cabal2nix`.
 2017-03-08 15:17:39 +01:00
Michael Alan Dorman d7496b560e gi-webkit2: fix gi-javascriptcore dependency 
This actually depends on the specially-versioned gi-javascriptcore
package.
 2017-03-08 15:17:39 +01:00
Benno Fünfstück 785fbfac65 haskell: add nix-specific fixes for various packages in stackage" 
This reverts commit fd0e0cdc76.

http-streams test suite is no longer broken, but still needs to be
disabled due to cyclic dependencies (http-streams(test) -> snap ->
http-streams)
 2017-02-19 11:34:21 +01:00
Thomas Tuegel fd0e0cdc76
Revert "haskell: add nix-specific fixes for various packages in stackage" 
This reverts commit 17c5ca9018.

This commit causes an evaluation error due to infinite recursion, which can be
tested by running:
```
$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace > /dev/null
```
 2017-02-18 12:48:05 -06:00
Benno Fünfstück 17c5ca9018 haskell: add nix-specific fixes for various packages in stackage 
With these overrides, nearly all of the stackage packages in the latest
stackage release should compile now.
 2017-02-18 14:34:53 +01:00