mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Code Issues Wiki Activity
46019 commits 233 branches 124 tags 7.3 GiB
Commit graph

39278 commits

Author SHA1 Message Date
Vladimír Čunát 5fa61a2904 blender: use permanent URL for the patch 
No hash changes.
 2014-07-22 18:06:42 +02:00
Vladimír Čunát 644c9eb6f7 Revert "Merge #3054: add kde 4.13.2" 
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e, reversing
changes made to 07a09fbe63.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
 2014-07-22 17:48:14 +02:00
Vladimír Čunát 4cbf520bfe e18.enlightenment: fix build by adding bzip2 
I'm lazy to find how exatly the need propagated in x-updates.
 2014-07-21 15:06:44 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Vladimír Čunát 65ac375aa2 Revert "qt4: try enableParallelBuilding again" 
This reverts commit e8dc6258a1.

It's unfortunate, but there still are occurrences of the missing ui_qtgradientview.h
on Hydra: http://hydra.nixos.org/build/12625390/nixlog/1/tail-reload
 2014-07-21 10:09:38 +02:00
Vladimír Čunát 923bf0a3ff mpv: major update, incl. build fix with new ffmpeg 
CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
 2014-07-21 10:05:50 +02:00
Vladimír Čunát 34cade2c9c mplayer2: switch to libav to fix build 
CC @viric. If someone has a better suggestion, do it.
IMHO the main problem is the lack of maintenance
from the side of mplayer2, e.g. latest release >3 years ago.
 2014-07-21 09:57:48 +02:00
Vladimír Čunát f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Bjørn Forsman cd3ba19ec0 asciidoc: add enableExtraPlugins expression argument 
'enableExtraPlugins = true' enables all the extra plugins (filters and
backends) that are available in the expression. This simplifies the
configuration for users who want to have the fullest possible asciidoc
configuration (not needing to enable each individual plugin).
 2014-07-20 23:03:27 +02:00
Bjørn Forsman 0ab24ad8c8 Revert "asciidoc: properly differentiate the "-full" variant in meta.description" 
I changed my mind about this, I no longer think that meta.description
should differ depending on the package configuration. A package
configuration can be very fine grained, and I don't think it's
possible/preferable to describe this in meta.description.

This reverts commit 9033821c34.
 2014-07-20 23:03:27 +02:00
Cillian de Róiste bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Peter Simons 5c0659f2b4 Merge pull request #3324 from linquize/git-2.0.2 
git: Update to 2.0.2
 2014-07-20 21:12:19 +02:00
Peter Simons 6609493aa5 Merge pull request #3322 from bennofs/haskell-gtk-gio 
haskell-gtk: re-generate after applying NixOS/cabal2nix#70
 2014-07-20 21:11:49 +02:00
Linquize 4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
Benno Fünfstück e2046181b6 haskell-gtk: re-generate after applying NixOS/cabal2nix#70 2014-07-20 16:56:19 +02:00
Pascal Wittmann 52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Pascal Wittmann c7add6c270 Merge pull request #3317 from Mathnerd314/prelink 
Add prelink package
 2014-07-20 14:03:12 +02:00
Vladimír Čunát 6b4929373f ffmpeg: major update 2.2.4 -> 2.3 
It's claimed to be fully API-compatible update.
 2014-07-20 08:44:58 +02:00
Vladimír Čunát 14953d7bc9 mesa: maintenance update 10.2.3 -> .4 2014-07-20 08:40:25 +02:00
Vladimír Čunát 65aacd459c harfbuzz: small update 2014-07-20 08:40:05 +02:00
Vladimír Čunát f456abacb7 xorg.libXi: bugfix update 2014-07-20 08:38:06 +02:00
Austin Seipp f677e843d5 hhvm: remove bash input 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-07-19 19:46:32 -05:00
Austin Seipp 03fd95d248 hhvm: Fix path to /bin/bash 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-07-19 19:44:43 -05:00
Peter Simons 713379c658 Re-generate Haskell packages with cabal2nix. 2014-07-19 21:12:04 +02:00
Cillian de Róiste 2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
Aycan iRiCAN de155d13da Merge pull request #3227 from hrdinka/haskell-stm-containers 
haskell-stm-containers: add package version 0.1.2 and its dependencies
 2014-07-19 11:47:42 +03:00
Aycan iRiCAN bfe2e05925 Merge pull request #3319 from luke-clifton/master 
Added cgrep utility.
 2014-07-19 11:43:06 +03:00
Aycan iRiCAN f057f06136 resolved conflicts 2014-07-19 11:25:30 +03:00
Aycan iRiCAN 9489105aca Merge branch 'haskellPackages.rest' 2014-07-19 11:18:18 +03:00
Luke Clifton 8fcd7bffb9 Merge remote-tracking branch 'upstream/master' 2014-07-19 15:45:31 +08:00
Austin Seipp 4b0178d2a4 hhvm: 3.1.0 -> 3.2.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-07-19 01:58:09 -05:00
Luke Clifton 2fbd9e07f2 Added cgrep utility. 2014-07-19 12:21:15 +08:00
Mathnerd314 dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
John Wiegley 73e0c50b30 haskell-git-annex: fix for darwin 
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
 2014-07-18 18:37:54 -05:00
John Wiegley ad31933ec4 haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically 2014-07-18 18:02:09 -05:00
John Wiegley 9b608c0e99 haskell-codex: jailbreak due to circular dependency 
It seems the codex-0.1.0.2 build requires 0.1.0.1.
 2014-07-18 18:00:27 -05:00
Eelco Dolstra 3282de17fd Revert "titanium: Bump to 3.3.0" 
This reverts commit 4426b8a3a1. It
causes an infinite recursion during Nixpkgs evaluation:

http://hydra.nixos.org/build/12608698

(@svanderburg)
 2014-07-18 23:49:33 +02:00
Alexander Tsamutali a1a9c26ccc Merge branch 'master' of https://github.com/NixOS/nixpkgs 2014-07-18 20:12:00 +04:00
Alexander Tsamutali cc4c108965 usb-modeswitch: Update to 2.2.0. 2014-07-18 20:11:16 +04:00
Peter Simons 489923be2a parsers-0.12: don't use this version yet because it breaks trifecta 2014-07-18 17:30:49 +02:00
Peter Simons ebed71f440 aeson: don't use version 0.8 yet because it breaks too many packages at the moment 2014-07-18 17:30:49 +02:00
Peter Simons 8a2aa3ccac haskell-parsers: add version 0.12 2014-07-18 17:30:49 +02:00
Peter Simons 2603db86d3 haskell-aeson: add version 0.8.0.0 2014-07-18 17:30:48 +02:00
Peter Simons 91c17543f2 haskell-QuickCheck: add version 2.7.6 2014-07-18 17:30:48 +02:00
Peter Simons 125aeed5a0 haddock: update to version 2.14.3 2014-07-18 17:30:48 +02:00
Peter Simons dfbce69f05 haskell-codex: update to version 0.1.0.2 2014-07-18 17:30:48 +02:00
Peter Simons c0791a5b2c haskell-HaRe: update to version 0.7.2.5 2014-07-18 17:30:48 +02:00
Peter Simons 82d1bce665 haskell-yaml: update to version 0.8.8.4 2014-07-18 17:30:48 +02:00
Peter Simons cc25d3f876 haskell-word8: update to version 0.1.1 2014-07-18 17:30:48 +02:00
Peter Simons 6c1a24766f haskell-webdriver: update to version 0.6.0.1 2014-07-18 17:30:48 +02:00