jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,156 Commits 266 Branches 122 Tags 5.3 GiB
df50903da8
Commit Graph

60156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shea Levy
df50903da8 Merge branch 'submit/enable-syncthing-osx' of git://github.com/ctheune/nixpkgs 
Enable syncthing for Mac OS X.
 2015-03-30 16:17:53 -04:00
Christian Theune
6daa2462c6 Enable syncthing for Mac OS X. 
Also requires enabling iana-etc. I'm shooting for "unix" platforms which
seems reasonable. Not sure why this was restricted to linux originally --
the history doesn't tell.
 2015-03-30 22:07:02 +02:00
Nikolay Amiantov
7c03829024 Merge pull request #7060 from abbradar/nm-l2tp 
Support L2TP in NetworkManager
 2015-03-30 23:05:42 +03:00
Shea Levy
b77aec818a Merge branch 'master' of git://github.com/ctheune/nixpkgs 
bump syncthing version to 0.10.30
 2015-03-30 16:03:04 -04:00
Christian Theune
703e43949d bump syncthing version to 0.10.30 2015-03-30 21:55:51 +02:00
Edward Tjörnhammar
1092b9da48 Merge pull request #7066 from edwtjo/xbmc-pruning 
Remove XBMC expressions in favor of the Kodi ones
 2015-03-30 21:46:29 +02:00
Edward Tjörnhammar
1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
John Wiegley
f2df60e2fb Merge pull request #7047 from codyopel/ffmpeg-darwin 
ffmpeg: improve cross platform support & fix licensing issues, resolves #7013
 2015-03-30 11:47:03 -05:00
lethalman
9c6e5527b2 Merge pull request #7028 from kevinmarsh/enum34 
Update python package enum34 1.0 -> 1.0.4
 2015-03-30 18:09:34 +02:00
lethalman
f72b0c43f6 Merge pull request #6762 from lethalman/nixos-install 
nixos-install: support -j, --cores and --option. Closes #6755
 2015-03-30 18:06:53 +02:00
lethalman
fed2cf85ec Merge pull request #7065 from pmahoney/skarnet-2015-03-28 
update s6, execline, other skarnet.org
 2015-03-30 17:57:41 +02:00
lethalman
dc560b5b02 Merge pull request #7031 from cwoac/mediatomb 
Add MediaTomb service
 2015-03-30 17:49:46 +02:00
lethalman
33fb8e2d52 Merge pull request #7084 from risicle/celery 
add packages for python-celery and its dependencies
 2015-03-30 17:39:33 +02:00
Luca Bruno
dee2a5dda3 obs-studio: fix derivation name 2015-03-30 17:37:24 +02:00
lethalman
ed46e81417 Merge pull request #7079 from jb55/obs-studio 
add obs-studio
 2015-03-30 17:37:02 +02:00
lethalman
f2bb0bf964 Merge pull request #6913 from bdimcheff/add-packages-brasero-soundjuicer 
Add packages brasero and soundjuicer
 2015-03-30 17:31:09 +02:00
lethalman
9bbeb44517 Merge pull request #6950 from joelmo/master 
searx: update 0.3.0 -> 0.7.0 + fetchgit -> fetchurl
 2015-03-30 17:24:00 +02:00
lethalman
9f3153b162 Merge pull request #6958 from lancelotsix/add_basemap_python_module 
Add python basemap package
 2015-03-30 17:22:24 +02:00
Peter Simons
aba61babe3 haskell-pandoc: disable test suite to fix the build 
The errors look harmless. Reported upstream at https://github.com/jgm/pandoc/issues/2036.
 2015-03-30 16:43:56 +02:00
Peter Simons
179f1b788f hackage-packages.nix: downgrade blaze-html and haddock-library to fix Pandoc build 2015-03-30 16:43:56 +02:00
Peter Simons
e568408367 Nomyx has been fixed upstream. 2015-03-30 16:43:55 +02:00
Peter Simons
6306f9a761 hackage-packages.nix: re-generate with recent hackage2nix 2015-03-30 16:43:55 +02:00
Peter Simons
d75bcc16f7 haskell-stringsearch no longer needs patching for GHC 7.10.x. 2015-03-30 16:43:55 +02:00
Peter Simons
b9dd22f1cb haskell-haddock-library fails its test suite. 2015-03-30 16:43:55 +02:00
Peter Simons
d619392bdc hackage-packages.nix: don't update default version of 'primitive' yet 2015-03-30 16:43:55 +02:00
Peter Simons
e42e1ea6de hackage-packages.nix: re-generate from Hackage 2015-03-29T03:47:46+0200 2015-03-30 16:43:55 +02:00
Peter Simons
83db889148 haskell-base: don't try to build this package 2015-03-30 16:43:54 +02:00
Peter Simons
834f2dc27b haskell-integer-gmp: don't try to build this package 2015-03-30 16:43:54 +02:00
Peter Simons
67950f036e haskell-marquise fails its test suite. 2015-03-30 16:43:54 +02:00
Peter Simons
3061ce63aa haskell-llvm-base: deprecated package (that doesn't compile) 2015-03-30 16:43:54 +02:00
Arseniy Seroka
8852d8b1af Merge pull request #7074 from oxij/x11support-python 
python 2.7: add x11Support option
 2015-03-30 17:38:06 +03:00
Arseniy Seroka
c1d5eee053 Merge pull request #7071 from oxij/conky-options 
conky: add lua-imlib2 and lua-cairo support, add more options, change defaults
 2015-03-30 17:36:38 +03:00
Arseniy Seroka
63f442a590 Merge pull request #7070 from oxij/more-cleanups 
More cleanups
 2015-03-30 17:35:38 +03:00
lethalman
b379026d7e Merge pull request #6993 from kevinmarsh/pyscss 
Add pyScss python package
 2015-03-30 16:11:03 +02:00
lethalman
468876b3f0 Merge pull request #7033 from gebner/jabref 
Add jabref, an open source bibliography manager.
 2015-03-30 16:08:02 +02:00
Robert Scott
1bf09248eb add packages for celery and its dependencies 2015-03-30 13:06:44 +01:00
Luca Bruno
eac32cf697 Revert "Merge pull request #7032 from flosse/change-option-names" 
This reverts commit c265aafb555d172baa56e22b2c371d0b6fbe4952, reversing
changes made to c9bbf2228f7a71f6bdec51a0c7bbb9ba7206c1ff.

Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471
 2015-03-30 13:45:07 +02:00
Karn Kallio
3661c7a842 kde-4.14 smokegen: prevent cmake from removing rpath on install 
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-03-30 13:37:16 +02:00
lethalman
c265aafb55 Merge pull request #7032 from flosse/change-option-names 
nixos: prosody service - rename 'enabled' to 'enable'
 2015-03-30 12:47:11 +02:00
William A. Kennington III
c9bbf2228f Merge pull request #7069 from taktoa/master 
Fixed grsecurity path patch for testing (3.19)
 2015-03-30 02:36:34 -07:00
lethalman
7ed5918b6c Merge pull request #7048 from joachifm/electrum-2.0.4 
Electrum: 2.0.3 -> 2.0.4
 2015-03-30 11:15:07 +02:00
lethalman
5f01b8a1d7 Merge pull request #7081 from avnik/gccgo-4.9 
Add gccgo build for GCC 4.9
 2015-03-30 11:03:28 +02:00
lethalman
d1a6a8c4cb Merge pull request #7072 from oxij/x11support-trivial 
x11Support: trivial
 2015-03-30 10:59:41 +02:00
lethalman
321b2e0439 Merge pull request #7073 from oxij/x11support-dbus 
dbus: rename useX11 option into x11Support, cleanup a bit
 2015-03-30 10:28:45 +02:00
Alexander V. Nikolaev
33120d9891 Add gccgo build for GCC 4.9 2015-03-30 11:03:23 +03:00
William Casarin
497eba7bcb add obs-studio 
Open Broadcaster Software is free and open source software for video recording
and live streaming

https://obsproject.com/
 2015-03-30 00:56:21 -07:00
Michael Raskin
70a1e3c837 propagate many inputs in imagemagick: otherwise dependent builds fail 2015-03-30 08:46:16 +03:00
William A. Kennington III
113c6c8f6a nixos/initrd: Do a lazy library copy in hopes to save some space for replaced binaries 2015-03-29 21:53:25 -07:00
William A. Kennington III
6b3cf366d7 nixos/initrd: Allow overriding of binaries 2015-03-29 21:26:39 -07:00
William A. Kennington III
0ff1fcf1f1 duplicity: 0.6.25 -> 0.7.02 2015-03-29 19:45:12 -07:00