3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

57908 commits

Author SHA1 Message Date
Peter Simons 7b99c149a4 Merge branch 'master' into staging. 2015-02-09 16:51:10 +01:00
codyopel 700f04b8da gsm: fix include directory 2015-02-09 10:30:10 -05:00
codyopel ac726eb2dd libass: refactor & 0.11.1 -> 0.12.1 2015-02-09 10:27:10 -05:00
Peter Simons a81cfcc475 hackage-packages.nix: re-generate from Hackage 2015-02-09T15:36:30+0100 2015-02-09 15:58:47 +01:00
Arseniy Seroka 462c145f18 Merge pull request #6251 from thorhop/upstream-master
Added Perl/Tk
2015-02-09 17:54:32 +03:00
Mateusz Kowalczyk 6e479db730 mkvtoolnix: update to 7.6.0 2015-02-09 12:43:09 +00:00
Mateusz Kowalczyk 2875250c5f mcomix: update to 1.01 2015-02-09 12:16:38 +00:00
Peter Simons c0a0f90a32 gnulib: update Git repository snapshot 2015-02-09 12:58:19 +01:00
Mateusz Kowalczyk 9dbfac7ece mpd: update to 0.19.9 2015-02-09 11:49:12 +00:00
Pascal Wittmann 6b5658bf23 bro: update from 2.3.1 to 2.3.2 2015-02-09 12:20:10 +01:00
Nikolay Amiantov aa323bd3f1 Merge pull request #6258 from abbradar/tkabber
tkabber: update version
2015-02-09 13:54:48 +03:00
Nikolay Amiantov a52db30bdb tkabber: update version 2015-02-09 13:10:12 +03:00
lethalman e08eb01c05 Merge pull request #6252 from benley/xbindkeys-config
New package: xbindkeys-config
2015-02-09 11:08:08 +01:00
Benjamin Staffin ea446390fa New package: xbindkeys-config
The patch is borrowed verbatim from Debian. It is under the same
license as the rest of the package, and is necessary for the app to
work.

There does not seem to be a canonical upstream homepage for this app
other than Debian itself.

Change-Id: I4f0bec32a95778fb12a48bfb280386b65a0d0f9a
2015-02-09 01:36:01 -08:00
Luca Bruno 10e7572d17 Use go1.4 instead of go-1.4 in derivation names. Closes #6243
I chose meta.branch because go 1.1 and 1.2 had this already.
2015-02-09 10:16:14 +01:00
j-keck dc9cdb2beb kpcli: 2.7 -> 2.8 2015-02-09 09:17:33 +01:00
Peter Simons 441e297fb7 Merge pull request #6256 from aycanirican/haskellngPackages_distributedprocessplatform
haskellngPackages.distributed-process-platform disable tests and haddock...
2015-02-09 09:07:43 +01:00
Aycan iRiCAN c37a69f60c haskellngPackages.distributed-process-platform disable tests and haddock, rename literate file. 2015-02-09 09:04:51 +02:00
Daniel Peebles f864b95dca Merge pull request #6232 from maun/sdl2
Modified SDL2 derivation to work on Mac OSX darwin
2015-02-09 02:01:09 -05:00
Domen Kožar 49c67589b6 iodine: 0.6.0-rc1 -> 0.7.0 2015-02-09 06:41:27 +01:00
Dan Peebles 3cb733779b Pretty sure nothing uses these, since they don't work (and we have a replacement in apple-source-releases) 2015-02-08 23:36:19 -05:00
Shea Levy 794edf60cd Merge branch 'nixos-master-test' of git://github.com/copumpkin/nixpkgs 2015-02-08 22:37:46 -05:00
Shea Levy 24c0844cfb Fix grub on nodev installs 2015-02-08 22:31:14 -05:00
Shea Levy 0d80ab2dd9 Fix grub1 support 2015-02-08 22:28:42 -05:00
Dan Peebles b0e1db1159 Fix boost 1.55 on clang (1.56 onwards already have the fix)
See https://trac.macports.org/ticket/42282 for more.
2015-02-08 22:19:04 -05:00
William A. Kennington III c165f24208 Merge pull request #6253 from codyopel/gsm
gsm: refactor
2015-02-08 17:21:04 -08:00
codyopel c951d7d449 gsm: refactor 2015-02-08 20:16:54 -05:00
Thor A. Hopland 7881f4f32c Added Perl/Tk 2015-02-09 02:08:53 +01:00
Dan Peebles da8ab2d947 Get mlton a little closer to working on darwin+clang (thanks to gridaphobe). Still impure, and needs more work. 2015-02-08 19:24:44 -05:00
Dan Peebles d8ad39d2e6 Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime) 2015-02-08 19:15:09 -05:00
Dan Peebles 063c901d6c Minor purification of emacs24Macport (for upcoming pure darwin stdenv) 2015-02-08 18:53:38 -05:00
William A. Kennington III 8405d37d9a Merge pull request #5530 from abbradar/ibt-hw
linux-firmware: add ibt-hw firmware
2015-02-08 14:59:09 -08:00
William A. Kennington III a4ef29c499 nfs-utils: Build and update for 1.3.2 2015-02-08 14:57:01 -08:00
Edward O'Callaghan bde3fe2335 nfs-utils: update from 1.2.5 to 1.3.1
Potentially fixes CVE-2013-1923.

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-02-08 14:57:01 -08:00
Arseniy Seroka e7db6fd1ac vimplugins: update vim2nix and VAM 2015-02-09 01:43:24 +03:00
William A. Kennington III bbefc61f71 Merge pull request #6241 from codyopel/faad2
faad2: refactor and add drm optional
2015-02-08 14:34:52 -08:00
William A. Kennington III 76f9f2b8ac Merge pull request #6246 from codyopel/fdkaac
fdk-aac: refactor and add example optional
2015-02-08 14:34:32 -08:00
William A. Kennington III 637ed5c6f6 Merge pull request #6226 from codyopel/ncmpcpp
ncmpcpp: add support for optional screens
2015-02-08 14:34:17 -08:00
William A. Kennington III c4bec1a0a4 Merge pull request #6152 from abbradar/samba-clean
nixos/samba: cleanup and update defaults
2015-02-08 14:20:49 -08:00
William A. Kennington III 2a0754ccbc Merge pull request #5994 from ts468/grub
Add 'target' parameter for GRUB installation chain
2015-02-08 14:18:13 -08:00
codyopel 51e995f006 fdk-aac: refactor and add example optional 2015-02-08 17:12:58 -05:00
codyopel 18fbca33bb faad2: refactor and add drm optional 2015-02-08 17:02:17 -05:00
codyopel b9bc4fdf1a ncmpcpp: refactor and add support for optional screens 2015-02-08 16:58:32 -05:00
Tomasz Kontusz 9fa910521e Bump TaskWarrior to 2.4.0 2015-02-08 22:48:41 +01:00
William A. Kennington III ac99fefae1 Formatting fixes 2015-02-08 13:42:12 -08:00
Edward Tjörnhammar e546997042 makemkv: 1.9.0 -> 1.9.1 2015-02-08 22:40:25 +01:00
William A. Kennington III 2a0ad62c56 Merge pull request #6239 from codyopel/faac
faac: refactor and add drm optional
2015-02-08 13:39:38 -08:00
William A. Kennington III 2828ad37e0 Merge pull request #6233 from codyopel/celt
celt: refactor to generic
2015-02-08 13:38:57 -08:00
William A. Kennington III 5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar 33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00