JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,144 Commits 2 Branches 0 Tags 12 GiB
b709036560
Commit Graph

47144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimír Čunát
9e31a33a44 merge #3330: ocaml: optionalize useX11, update -pcre 2014-08-12 21:55:12 +02:00
Vladimír Čunát
08f5932729 ocaml: refactor the useX11 check to actually work 2014-08-12 21:53:02 +02:00
Vladimír Čunát
141b5d961f Merge master into PR 
Conflicts:
	pkgs/development/compilers/ocaml/4.01.0.nix
 2014-08-12 21:52:20 +02:00
drozv
33fec9d04d ocaml: fix x11 include and lib parameters for configure script 
Close #2923, fixes #2922.
 2014-08-12 21:41:37 +02:00
Domen Kožar
8c50807c4d dunst: git -> 1.1.0 2014-08-12 21:23:44 +02:00
Jascha Geerds
bebdea6ac9 pycharm: add icon in desktop file 2014-08-12 21:21:57 +02:00
Vladimír Čunát
c78e6df8e0 Merge #3251: fix hugin and enblend-enfuse by updating 
A few fixups included.
 2014-08-12 21:19:41 +02:00
Vladimír Čunát
df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost 
Also unset meta.broken.
 2014-08-12 21:17:53 +02:00
Vladimír Čunát
54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Harald van Dijk
67a5ec4efb nixos/lighttpd: fix modules for gitweb 
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.

[Bjørn: modify commit message]
 2014-08-12 21:16:01 +02:00
Vladimír Čunát
56f409a446 glmark2: style fixups 2014-08-12 20:58:36 +02:00
Vladimír Čunát
a3d33de16a Merge #3248: add glmark2-2014.03 2014-08-12 20:53:11 +02:00
Vladimír Čunát
566058b477 Merge #3152: add pyqt5 2014-08-12 20:33:34 +02:00
Vladimír Čunát
e80f41f35e Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval 
More helpful message when refusing to evaluate "broken" package
 2014-08-12 20:18:10 +02:00
Vladimír Čunát
bcdbbf3ea1 Merge #2129: add trusted computing components 2014-08-12 19:43:34 +02:00
AndersonTorres
526edcaf15 Aegisub: update to 3.2.0 2014-08-12 19:43:16 +02:00
Vladimír Čunát
abd361173a PR fixups: use mirror://, drop unused params, etc. 
Note: hash of trousers tarball didn't match (anymore),
so I updated it to the one from sourceforge.
It's probably some safe and tiny retrospective update.
 2014-08-12 19:42:23 +02:00
Vladimír Čunát
87c3c0e885 Merge master into #2129 
Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
 2014-08-12 19:24:08 +02:00
Oliver Charles
4e2adbeb4d haskellPackages.bound: New expression 2014-08-12 18:11:33 +01:00
Vladimír Čunát
665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs 
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
 2014-08-12 19:08:53 +02:00
Vladimír Čunát
905b163b49 Revert "lib/licenses.nix: allow choosing license by its shortName" 
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
 2014-08-12 19:05:54 +02:00
John Wiegley
01ecaf98a5 haskell-lambdabot: only mark as broken for GHC 7.8.3 2014-08-12 11:53:01 -05:00
John Wiegley
62ceaca0b9 haskell-djinn: only mark as broken for GHC 7.8.3 2014-08-12 11:52:38 -05:00
Matt Miemiec
8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Emil Rangden
3a4fc75f52 jailbreak http-attoparsec list-tries and socket-io 2014-08-12 16:10:00 +02:00
Mateusz Kowalczyk
0143d35a3b haskell-bitarray: update to 0.0.1.1 
Upstream informed me that the ‘array’ problem should be fixed.
 2014-08-12 16:09:37 +02:00
Peter Simons
d3c68cd723 haskell-cabal2nix: update to version 1.68 2014-08-12 16:09:22 +02:00
Luca Bruno
14895d6c95 Merge branch 'gdm' 2014-08-12 14:57:38 +02:00
Michael Raskin
4ab466cc56 Update OpaLang; it still doesn't build for a mysterious reason: apparently the missing fields are actually defined… 2014-08-12 16:22:25 +04:00
Michael Raskin
6129a7aea6 Help kadu find phonon 2014-08-12 16:22:25 +04:00
Moritz Ulrich
a163d484fc ldm: Bump to 0.5. 
We don't build docs because it would pull in git and perl as deps.
 2014-08-12 13:52:48 +02:00
Moritz Ulrich
e3bf7253b0 rebar: Bump to 2.5.1. 2014-08-12 13:47:59 +02:00
Moritz Ulrich
79c835212b Erlang R17: Bump to 17.1. 2014-08-12 13:47:38 +02:00
Moritz Ulrich
1f221a72de dfu-programmer: Bump to 0.7. 2014-08-12 13:42:10 +02:00
Moritz Ulrich
2486f89aed isync: Bump to 1.1.1 2014-08-12 13:34:37 +02:00
Florian Friesdorf
53490bd17e include ssl with python2.6 as is the case with 2.7 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-08-12 13:33:23 +02:00
Rickard Nilsson
bdea35d98b obnam: Update from 1.6.1 to 1.8 2014-08-12 13:32:24 +02:00
Florian Friesdorf
93593a09b6 muscleframework/tool remove platform as lib is marked broken 2014-08-12 13:02:11 +02:00
Domen Kožar
cc8e4f6814 provide pulseaudioFull and set it as default to hardware.pulseaudio.package 2014-08-12 12:51:25 +02:00
Peter Simons
e823c123a8 Don't build broken Haskell packages on Hydra. 
These packages don't compile:

 - cabal-delete
 - cabal-file-th
 - categories
 - cmdtheline
 - codec-image-devil
 - concurrent-extra
 - cryptol 1.8.x
 - data-lens
 - diagrams-postscript
 - djinn
 - download
 - dstring
 - enummapset
 - git-date
 - github-backup
 - gtkglext
 - happyy-meta
 - haskeline-class
 - pakcs

These packages depend on some of the packages listed before:

 - Chart-diagrams
 - data-lens-template
 - hp2any-manager
 - purescript
 - repr

These packages fail with GHC 7.8.3 but still compile with older compilers:

 - happy: 1.18.4, 1.18.5, 1.18.6
 2014-08-12 12:37:44 +02:00
Peter Simons
f9f26acd4a pakcs: it appears that upstream changed the source code without bumping the version number 2014-08-12 12:37:44 +02:00
Peter Simons
82f70114b8 haskell-hfsevents: re-generate expression with cabal2nix 2014-08-12 12:37:44 +02:00
Peter Simons
46e5a78b81 haskell-Allure: add version 0.4.99.0 2014-08-12 12:37:44 +02:00
Peter Simons
1703d9f7cc haskell-LambdaHack: update to version 0.4.99.0 2014-08-12 12:37:44 +02:00
Peter Simons
9a97c54d7d haskell-yesod-test: update to version 1.2.5 2014-08-12 12:37:44 +02:00
Peter Simons
34a7dc7859 haskell-warp: update to version 3.0.0.7 2014-08-12 12:37:44 +02:00
Peter Simons
25fb19593c haskell-transformers-base: update to version 0.4.3 2014-08-12 12:37:43 +02:00
Peter Simons
ac50d66698 haskell-regex-applicative: update to version 0.3.0.3 2014-08-12 12:37:43 +02:00
Peter Simons
eaf66142bf haskell-purescript: update to version 0.5.4.1 2014-08-12 12:37:43 +02:00
Peter Simons
255eaf6b3c haskell-mwc-random: update to version 0.13.2.0 2014-08-12 12:37:43 +02:00