Commit Graph

12788 Commits

Author SHA1 Message Date
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Vladimír Čunát
9253a95f6b glibc: fix CVE-2014-0475 by upstream patches
https://sourceware.org/bugzilla/show_bug.cgi?id=17137
2014-08-04 16:49:57 +02:00
Aycan iRiCAN
f20f30af2c Merge pull request #3457 from luke-clifton/lc-haskell-ad
Adding Haskell Package AD for automatic differentiation
2014-08-04 14:16:25 +03:00
Luke Clifton
1501536dcd Adding Haskell Package AD for automatic differentiation 2014-08-04 18:21:25 +08:00
cbpark
65949e7415 Add haskell-probability 2014-08-04 00:58:17 +02:00
Michael Raskin
9695af7d47 Update libSodium cryptography library 2014-08-03 22:29:41 +04:00
aszlig
367718a80f
libxkbcommon: Update to version 0.4.2.
Fixes build of i3lock and to possibly prevent breakage of other
packages, I've tested building of gtk3 and qt5 (partial, core2duo here).
I know it's not a comprehensive test but we can still revert in case
Hydra reports more builds failing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-03 17:37:58 +02:00
Sven Keidel
97a1b91f1b libid3tag: move pkgconfig file into the nix-expression directory
[Bjørn Forsman:
 * use "mkdir -p" instead of "ensureDir" (deprecated)
 * place *.pc file in $out/lib/pkgconfig/ (instead of
   $out/share/pkgconfig/ which doesn't work)
 * prefix commit message with "libid3tag:"
]
2014-08-03 17:34:40 +02:00
Peter Simons
aff65bbb57 yajl: fix evaluation 2014-08-03 15:16:38 +02:00
Sander van der Burg
8eb8d69544 Merge pull request #3290 from MP2E/SDL_Mixer_FSynth
SDL_mixer : add option to enable FluidSynth for playing MIDIs with SF2s
2014-08-03 14:57:38 +02:00
Rok Garbas
335575a51e geoclue: update to 2.1.9 2014-08-03 13:22:06 +02:00
Rok Garbas
92f7908d5b yajl: name of downloaded tarbal should be the same as derivation name 2014-08-03 13:21:08 +02:00
Vladimír Čunát
1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
System administrator
a1e392267d fix download url 2014-08-02 09:20:49 +02:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Vladimír Čunát
9fcd3c2825 libdrm: update 2014-08-02 04:43:11 +02:00
Vladimír Čunát
3a6135a907 harfbuzz: small update 2014-08-02 04:31:51 +02:00
Vladimír Čunát
f681a7683c poppler: maintenance update 2014-08-02 04:31:26 +02:00
Blaz Bratanic
1ecfba4391 Fixed download path 2014-08-01 22:41:33 +02:00
Mateusz Kowalczyk
ed51045f13 haskell-bencoding: 0.4.3.0 2014-07-31 19:12:43 +02:00
Sander van der Burg
30a941aa88 Change location of libmatthew-java to fedora's mirror. Original one is unreachable 2014-07-31 17:58:03 +02:00
Vladimír Čunát
ddcc163711 libav: maintenance updates of all three branches
(cherry picked from commit c61c7e7313fdc5e402b0f71e0430ae3367a7c55c)
2014-07-31 16:30:04 +02:00
Peter Simons
14ad244d92 haskell-snaplet-redis: update to version 0.1.3.3 2014-07-31 15:48:28 +02:00
Peter Simons
d4a863bdeb haskell-optparse-applicative: update to version 0.9.1.1 2014-07-31 15:48:26 +02:00
Peter Simons
6d40d5e564 haskell-hackage-db: update to version 1.8 2014-07-31 15:48:24 +02:00
Peter Simons
bb4d15a115 haskell-yesod-form: update to version 1.3.14 2014-07-31 13:57:46 +02:00
Peter Simons
9e4a54f4a6 haskell-yesod-core: update to version 1.2.19 2014-07-31 13:57:46 +02:00
Peter Simons
a2b1580716 haskell-semigroupoids: update to version 4.2 2014-07-31 13:57:46 +02:00
Peter Simons
a37b5628f6 haskell-resourcet: update to version 1.1.2.3 2014-07-31 13:57:46 +02:00
Peter Simons
7fa6ba9468 haskell-profunctors: update to version 4.2.0.1 2014-07-31 13:57:46 +02:00
Peter Simons
56fb2db243 haskell-pipes-network: update to version 0.6.4 2014-07-31 13:57:46 +02:00
Peter Simons
c816e89348 haskell-network-simple: update to version 0.4.0.1 2014-07-31 13:57:46 +02:00
Peter Simons
f194df999f haskell-liblastfm: update to version 0.4.0.0 2014-07-31 13:57:46 +02:00
Peter Simons
78ad8ce046 haskell-lens: update to version 4.3.3 2014-07-31 13:57:46 +02:00
Peter Simons
ca971dfa27 haskell-fay-base: update to version 0.19.2 2014-07-31 13:57:46 +02:00
Peter Simons
2d2237ed17 haskell-GLUtil: update to version 0.8 2014-07-31 13:57:45 +02:00
Peter Simons
7387244094 haskell-vty: update to version 5.1.4 2014-07-31 13:57:45 +02:00
Peter Simons
5f2ad413b7 haskell-xml-html-conduit-lens: add version 0.3.2.0 2014-07-31 13:57:45 +02:00
Peter Simons
73f1976155 haskell-cgrep: update to version 6.4.5 2014-07-31 13:57:45 +02:00
Pascal Wittmann
3e35b46519 Merge pull request #3413 from svenkeidel/gtkpod
version bump gtkpod from 1.0.0 to 2.1.4
2014-07-31 13:26:37 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d98544ab37741f740dd3516023924b27.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
John Wiegley
11dc22e3ee Agda needs an older version of haskell-equivalence 2014-07-30 18:10:59 -05:00
Sven Keidel
2d31046a40 gtkpod: bump to 2.1.4 2014-07-31 00:41:17 +02:00
Peter Simons
877585bf38 haskell-yesod-auth: update to version 1.3.3 2014-07-29 18:39:35 +02:00
Peter Simons
3b07c45fb7 haskell-wai-extra: update to version 3.0.1.1 2014-07-29 18:39:35 +02:00
Peter Simons
5fd8cff160 haskell-stm-containers: update to version 0.1.3 2014-07-29 18:39:35 +02:00
Peter Simons
5738b59400 haskell-profunctors: update to version 4.2 2014-07-29 18:39:35 +02:00
Peter Simons
f900746689 haskell-filestore: update to version 0.6.0.3 2014-07-29 18:39:35 +02:00
Peter Simons
3e551e05c6 haskell-conduit-extra: update to version 1.1.3 2014-07-29 18:39:34 +02:00
Peter Simons
d711c60c3d haskell-base-prelude: add version 0.1.3 2014-07-29 18:39:34 +02:00