ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 08:38:18 +03:00
Code Issues Projects Releases Wiki Activity
114,929 Commits 96 Branches 102 Tags 4.3 GiB
01a6878bb1
Commit Graph

2459 Commits

Author SHA1 Message Date
Peter Simons
1fb8734fdd Merge pull request #28492 from ttuegel/idris-packages 
Update Idris
 2017-08-23 14:03:39 +02:00
Thomas Tuegel
b438d394ce
idrisPackages.idris: 1.0 -> 1.1.1 2017-08-23 06:45:32 -05:00
Alex Brandt
8b4fec00e0 add alunduil as collection-json maintainer 2017-08-22 18:31:08 -05:00
John Ericson
19de1f537e haskell infra: Make sure packages get custom stdenv 
One of the goals of 74f5fe5 was to allow passing in a custom stdenv,
which would be used for genericBuilder's `mkDerivation` call. That does
work, but if packages takes `stdenv` as an parameter for any reason,
they'll get the default one instead. This change remedies it.
 2017-08-22 16:00:21 -04:00
Peter Simons
7b16f5974e git-annex: update to version 6.20170818 
Fixes CVE-2017-9800, CVE-2017-12836, CVE-2017-1000116, and CVE-2017-1000117.
 2017-08-22 14:52:29 +02:00
Peter Simons
499b9ebc01 liquidhaskell: fix build of the required old aeson version 
Closes https://github.com/NixOS/nixpkgs/issues/28372.
 2017-08-22 14:52:29 +02:00
Peter Simons
f445fe7574 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1-5-g0ed67c9 from Hackage revision
a355eb34ee.
 2017-08-22 14:52:25 +02:00
Peter Simons
4ad193dd27 hackage2nix: partially revert https://github.com/NixOS/nixpkgs/pull/28383 to fix evaluation 
5342bffc15 refers to an unknown Nixpkgs maintainer.
 2017-08-22 14:51:57 +02:00
Peter Simons
4c07f40597 hackage2nix: keep old base-orphans around for liquidhaskell 2017-08-22 14:51:57 +02:00
Domen Kožar
37c340728e
servant-auth: tests pass for a while now 2017-08-21 14:42:05 +02:00
Peter Simons
6fe751fb5c ghcWithHoogle: deal gracefully with packages that have no haddockDir attribute 2017-08-19 17:20:39 +02:00
Peter Simons
01b8c4c9e5 ghcWithHoogle: cosmetic for the sake of Emacs syntax highlighting 2017-08-19 17:19:47 +02:00
Peter Simons
1ddf621b4e hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
cf0ce68962.
 2017-08-19 16:28:19 +02:00
Peter Simons
5468d5c662 Merge pull request #27991 from Profpatsch/hoogleLocal-fix 
Fix the `ghcWithHoogle` function to cope with the presence of separate `doc` outputs.
 2017-08-19 16:26:30 +02:00
Alex Brandt
5342bffc15 remove collection-json from dont-distribute-packages 
I believe I've fixed the build issues for collection-json and would like
to see it make it into the next stable release of NixOS.  I'm also
adding myself as maintainer.

Let me know if there is anything I did incorrectly or missed.
 2017-08-19 08:41:23 +02:00
Peter Simons
b6a746daa1 Merge pull request #28097 from cocreature/sdistTarball-doc 
haskell: remove any extraneous outputs from sdistTarball
 2017-08-18 16:32:51 +02:00
Daiderd Jordan
d491eebffd
haskell-packages: fix evaluation 2017-08-17 22:43:15 +02:00
Peter Simons
7b73fb3b8a hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1-4-g53777ef from Hackage revision
79410fccc7.
 2017-08-17 21:32:29 +02:00
Peter Simons
6ff62030d9 LTS Haskell 9.1 2017-08-17 21:32:26 +02:00
Domen Kožar
105864a24d
purescript: fix building #28296 2017-08-16 15:44:28 +02:00
rnhmjoj
da8712e4e9 haskellPackages.shell-conduit: fix failing test 2017-08-15 12:06:53 +02:00
Jude Taylor
6883119ab0 add some overrides for ghc 7.10.3 to build ghcjs 2017-08-13 13:32:08 -07:00
Frederik Rietdijk
13bbaee21d Merge pull request #27881 from mimadrid/fix/http-https 
Update homepage attributes: http -> https
 2017-08-13 21:53:20 +02:00
Frederik Rietdijk
7ebcd39a0f Merge commit '4c49205' into HEAD 2017-08-13 18:34:59 +02:00
Peter Simons
a9e463bc9d hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1 from Hackage revision
3ff230318a.
 2017-08-12 18:15:49 +02:00
Domen Kožar
486e1c3c16 Merge pull request #27998 from davidak/macOS 
replace "Mac OS X" and "OS X" with "macOS"
 2017-08-11 13:01:36 +02:00
Moritz Kiefer
291da85ed9 haskell: remove any extraneous outputs from sdistTarball 2017-08-10 08:48:59 +02:00
Jude Taylor
7e3e790675 add override for html-entities 2017-08-08 14:29:33 -07:00
Jude Taylor
eeeead21c5 add override for digestive-functors-blaze 2017-08-08 11:56:31 -07:00
Peter Simons
550373b000 cabal-install: fix build after updating to version 2.x 2017-08-08 10:09:56 +02:00
Peter Simons
35dd36a027 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1 from Hackage revision
d913f9a17b.
 2017-08-08 10:09:46 +02:00
Peter Simons
142df08825 hackage2nix: update list of broken packages 2017-08-08 10:09:44 +02:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS" 
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
 2017-08-07 21:41:30 +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
Peter Simons
f152749c99 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4.1 from Hackage revision
cfa51cac76.
 2017-08-07 08:58:48 +02:00
Profpatsch
4a8efae000 pkgs/haskell-modules/hoogle.nix: find haddocks by haddockDir 
Previously a few clumsy shell globs were used to find haddock output, which
broke every time something in `generic-builder.nix` changed.
Use the new `haddockDir` identifier exported by haskell packages.
 2017-08-06 22:02:50 +02:00
Profpatsch
e9e25ec5fe pkgs/haskell-modules: expose haddockDir as passthru variable 
WIP

If the `hoogle.nix` file wants to have any sane chance of finding haddock
outputs, the packages need to export the haddock folders as an identifier.

A few TODOs still stand, like passing self to the package instead of needing to
pass it to `haddockDir`. Maybe the exported identifier should be integrated into
the fixpoint somehow instead of using `passthru`?
 2017-08-06 21:48:22 +02:00
Profpatsch
3f27a36912 pkgs/haskell-modules: two small vanity fixes 2017-08-06 21:46:49 +02:00
Profpatsch
4e6c41e7fa pkgs/haskell-modules: fix hoogleLocal docstring 2017-08-06 21:46:22 +02:00
Domen Kožar
71bebd5254
{fs,h}notify: move to configuration-nix.nix 2017-08-06 10:42:37 +02:00
Domen Kožar
8e16cee256
double-conversion: remove patch superseeded by ghc patch 
https://github.com/NixOS/nixpkgs/pull/27584
 2017-08-06 10:42:37 +02:00
Robin Gloster
688f066da2
haskellPackages.servant: fix hash 2017-08-04 17:04:03 +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
Peter Simons
a2825a3c6f hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
c54ab27c33.
 2017-08-03 13:11:56 +02:00
mimadrid
09e0cc7cc7
Update homepage attributes: http -> https 
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
 2017-08-03 11:56:15 +02:00
John Wiegley
0396ca6150
ghc-events_0_6_0 no longer exists 2017-08-01 09:34:50 -07:00
Peter Simons
92031d6e01 structured-haskell-mode: bump version to latest git head 
Chris doesn't seem to make release any more.
 2017-08-01 15:35:44 +02:00
Peter Simons
4fe328c6ca haskell-hindent: fix location of the "site-lisp" symlink 2017-08-01 15:25:19 +02:00
Peter Simons
ef6849ca63 structured-haskell-mode: fix location of the "site-lisp" symlink 2017-08-01 15:25:19 +02:00
Frederik Rietdijk
b2608b8910 Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-29 13:08:11 +02:00
Peter Simons
47e3245691 haskell.lib: drop obsolete hasNoDataOutput and hasNoDocOutput functions 2017-07-29 12:39:26 +02:00
Frederik Rietdijk
55357de67a Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-28 19:37:36 +02:00
Peter Simons
cb1742e76d haskell: fix builds broken by LTS-9 update 2017-07-28 18:14:02 +02:00
Peter Simons
f442bbcdec hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4-2-ge4f891e from Hackage revision
f72c20d338.
 2017-07-28 18:13:57 +02:00
Peter Simons
30fbeed254 LTS Haskell 9.0 
Minus the broken wai-middleware-prometheus-0.2.0 package.
 2017-07-28 18:13:27 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Peter Simons
382db8a9ad cabal2nix: version 2.4 needs Cabal 2.x 2017-07-27 15:47:03 +02:00
Peter Simons
86b230efd9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.4 from Hackage revision
3fd8431bf5.
 2017-07-27 15:46:59 +02:00
Nikolay Amiantov
94adf8d17d haskellPackages.threadscope: fix build 2017-07-27 12:47:58 +03:00
Domen Kožar
073b30563d ghc-mod: fix build to cope with new split-output work 2017-07-27 09:12:41 +02:00
Peter Simons
2b0ce7aeab hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.3.1-25-ge9e9669 from Hackage revision
8b34a74f81.
 2017-07-27 09:12:36 +02:00
michael bishop
be63b1994d enable split-output builds for all haskellPackages 2017-07-27 09:12:06 +02:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
 2017-07-26 13:46:04 -04:00
William Casarin
d680c2352c jailbreak-cabal: specifically use ghc802 override in ghc821 config 
Otherwise this will infinite loop when:

  pkgs.haskellPackages = pkgs.haskell.packages.ghc821
 2017-07-26 10:44:50 -07:00
John Ericson
ea7d13cf1a stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell 
This is a temporary measure until this impurity is removed from Nix.
 2017-07-26 09:08:01 -04:00
John Ericson
f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files 
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
 2017-07-26 09:07:55 -04:00
Peter Simons
175c3526ae haskell: provide the name 'bin-package-db' (null) to fix evaluation errors 2017-07-26 10:20:31 +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
a9111840fa haskell: provide the name 'ghcjs-prim' (null) to fix evaluation errors 2017-07-26 10:20:30 +02:00
Peter Simons
91a8ed37af hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.3.1-23-g656c589 from Hackage revision
2b4eeaa78b.
 2017-07-26 10:20:25 +02:00
Peter Simons
1178136336 hackage2nix: disable failing builds 2017-07-26 10:19:58 +02:00
Peter Simons
fd6f0a2127 hackage2nix: drop obsolete version of zlib 2017-07-26 10:19:57 +02:00
Peter Simons
8a3c080237 hackage2nix: drop old packages that were required for stack prior to version 1.5.x 2017-07-26 10:19:57 +02:00
Peter Simons
4664cf8079 hackage2nix: keep Cabal 1.24.x around for the time being 2017-07-26 10:19:57 +02:00
Peter Simons
efa3ba8950 haskell-diagrams-solve: disable failing test suite to fix the build 2017-07-26 10:18:10 +02:00
Peter Simons
27ca0cb3d4 haskell-generic-builder: fix syntax high-lightning in Emacs 2017-07-26 10:17:48 +02:00
Peter Simons
e69c7f5641 haskell-generic-builder: include setupHaskellDepends in the generated "env" attribute 
We achieve this by moving setupHaskellDepends from the buildInputs attribute
into "otherBuildInputs", which is the attribute the builder uses to construct
the build inputs in both the actual build as well as the "env" attribute.
 2017-07-26 10:17:48 +02:00
Nick Hu
34beeac70b fix haskellPackages.cuda and some tools dependent on cudatoolkit 2017-07-24 16:55:11 +01:00
John Ericson
b087618ac0 Revert "stdenv: Store one package per line in nix-support/propagated-*" 
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.

This reverts commit 3cb745d5a6.

[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
 2017-07-24 01:05:30 -04:00
Frederik Rietdijk
29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Peter Simons
3cc46829c7 haskell-symengine: the build is broken because the system library this code binds to does not exist 
This error isn't easily detectable, however, because the Cabal files declares
the dependency on "symengine" for the test program rather than for the library
itself.

https://github.com/symengine/symengine.hs/pull/14
 2017-07-19 18:55:38 +02:00
Peter Simons
476fc5f26e haskell-cautious-file: jailbreak to fix the build 2017-07-18 16:51:09 +02: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
6de60af3a9 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.3.1-12-gcb2265e from Hackage revision
f69cfc36c9.
 2017-07-17 22:04:25 +02:00
Peter Simons
dd7824919e LTS Haskell 8.23 2017-07-17 22:04:24 +02:00
Vladimír Čunát
e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
Domen Kožar
0eb4f6fd25
Merge commit 'a889454869e4f7d5ba6067ebcc0ba7fcd26e4417' 
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.

http://hydra.nixos.org/eval/1375094
 2017-07-14 11:55:41 +02:00
John Ericson
ea9af6e3bd Merge pull request #27336 from obsidiansystems/stdenv-setup-cleanup 
Stdenv setup misc cleanups
 2017-07-13 18:41:33 -04:00
Peter Simons
85c884278e haskell-lens: use latest version when compiling with ghc-8.2.x 2017-07-13 08:47:01 +02:00
Peter Simons
559b1b7647 haskell-semigroupoids: use latest version when compiling with ghc-8.2.x 2017-07-13 08:47:01 +02:00
Peter Simons
c6ccfcd01a haskell-base-orphans: use latest version when compiling with ghc-8.2.x 2017-07-13 08:47:01 +02:00
Peter Simons
bde4ef2234 haskell-hashable: jailbreak to fix build with ghc-8.2.x 2017-07-13 08:44:18 +02:00
Peter Simons
2180d2c118 haskell-jailbreak-cabal: use stable version from ghc-8.0.x in ghc-8.2.x package set 
The version compiled with Cabal 2.x breaks many packages, like doctest and
hashable. This needs further investigation.
 2017-07-13 08:44:18 +02:00
Peter Simons
26762f1e1e haskell-base-orphans: disable test suite to avoid build failures with ghc-8.2.x 2017-07-13 08:44:18 +02:00
Peter Simons
0ee5424ebf haskell-doctest: remove obsolete jailbreak; ghc-8.2.x can build this package now 2017-07-13 08:44:18 +02:00
Peter Simons
f980dbec97 haskell-ChasingBottoms: jailbreak to fix build with ghc-8.2.x 2017-07-13 08:44:17 +02:00
Peter Simons
e59c532c23 haskell-hspec-meta: use latest version when compiling with ghc-8.2.x 
Fixes https://github.com/hspec/hspec/issues/323.
 2017-07-13 08:44:17 +02:00
John Ericson
8d76effc17 stdenv-setup: Make the package accumulators associative arrays instead of strings 
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
 2017-07-12 15:30:56 -04:00