William A. Kennington III
453f7c7218
Merge branch 'master.upstream' into staging.upstream
2015-11-14 12:39:32 -08:00
William A. Kennington III
6e18a33183
syslinux: 6.03 -> 2015-11-09
2015-11-14 12:38:56 -08:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Domen Kožar
5e21f4e20b
fix cython build
2015-11-14 16:50:23 +01:00
Damien Cassou
971b90e98d
Merge pull request #11015 from DamienCassou/elisp-ffi-1.0.0
...
elisp-ffi: git-20141103 → 1.0.0
2015-11-13 22:33:36 -03:00
William A. Kennington III
8f45d18a71
Merge branch 'master.upstream' into staging.upstream
2015-11-13 15:54:10 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Damien Cassou
195246c316
elisp-ffi: git-20141103 → 1.0.0
2015-11-13 20:08:42 -03:00
Domen Kožar
83aeb00a78
Merge pull request #11010 from FRidh/bcrypt
...
python bcrypt: 1.0.2 -> 2.0.0
2015-11-13 23:18:47 +01:00
Arseniy Seroka
0125adc392
Merge pull request #10999 from noctuid/zscroll
...
zscroll: init at 1.0
2015-11-14 00:55:48 +03:00
noctuid
b0fd85342b
zscroll: init at 1.0
2015-11-13 14:58:19 -05:00
Frederik Rietdijk
31563a291c
python bcrypt: 1.0.2 -> 2.0.0
2015-11-13 17:05:28 +01:00
Arseniy Seroka
f7bd63dc77
Merge pull request #10977 from sjourdois/ffmpeg
...
darwin: ffmpeg-full and deps: darwin fixes
2015-11-13 17:43:54 +03:00
Arseniy Seroka
bb70d1928d
Merge pull request #10974 from datakurre/datakurre-numba
...
darwin: numba: fix build on darwin
2015-11-13 17:43:23 +03:00
Arseniy Seroka
7ee9959984
Merge pull request #10990 from rnhmjoj/imv
...
imv: init at 1.0.0
2015-11-13 17:41:42 +03:00
Arseniy Seroka
6221526b13
Merge pull request #10992 from oxij/package-macopix
...
macopix: init at 1.7.4
2015-11-13 17:40:37 +03:00
Arseniy Seroka
9ea4e30327
Merge pull request #10994 from oxij/sdl-pulseaudio
...
SDL: better pulseaudioSupport logic
2015-11-13 17:39:30 +03:00
Arseniy Seroka
6a192b4e98
Merge pull request #10997 from oxij/emacs-packages-metas
...
emacs-packages: fix metas, add descriptions, split git-rebase from magit
2015-11-13 17:38:57 +03:00
Arseniy Seroka
653143b4b1
Merge pull request #11006 from Lassulus/master
...
bitlbee-steam: init at 2015-09-10
2015-11-13 17:37:06 +03:00
makefu
a824242830
snapraid: init at 8.1
2015-11-13 15:06:22 +01:00
lassulus
4803b2f31a
bitlbee-steam: init at 2015-09-10
2015-11-13 14:37:41 +01:00
Damien Cassou
5c6725b7e3
Merge pull request #10984 from DamienCassou/elisp-ffi
...
elisp-ffi: init at git 2014-11-03
2015-11-13 10:25:50 -03:00
Nikolay Amiantov
f4ec8c9dc7
pcsctools: 1.4.23 -> 1.4.25
2015-11-13 15:28:45 +03:00
Nikolay Amiantov
8286d0ba05
pcscperl: init at 1.4.13
2015-11-13 15:28:41 +03:00
Damien Cassou
965fbcc419
elisp-ffi: init at git 2014-11-03
2015-11-13 08:23:14 -03:00
Oliver Dunkl
928e202034
python-packages: pafy 0.4.1 -> 0.4.2
2015-11-13 09:29:55 +01:00
Peter Simons
8c344bdcc2
Merge pull request #10939 from peti/drop-obsolete-haskell-ng-names
...
Drop obsolete "haskell-ng" and "haskellngPackages" aliases.
2015-11-13 00:01:41 +01:00
Jan Malakhovski
58a8485090
emacs-packages: split git-rebase from magit, deprecate git-rebase-mode
...
magit doesn't depend on git-rebase, git-rebase depends on magit
2015-11-12 21:23:15 +00:00
Jan Malakhovski
2d14b2d540
emacs-packages: fix metas, add descriptions, deprecate git-commit-mode
2015-11-12 21:23:15 +00:00
Jan Malakhovski
05f6e0fdaa
SDL: better pulseaudioSupport logic
2015-11-12 21:07:45 +00:00
Jan Malakhovski
394d5176c2
macopix: init at 1.7.4
2015-11-12 20:54:48 +00:00
Domen Kožar
a99a634acf
Merge pull request #10826 from NarrativeScience/skip_broken_pandas_test
...
skip broken pandas test when on python 3.5
2015-11-12 20:55:27 +01:00
Domen Kožar
6f4d790d85
Merge pull request #10982 from FRidh/python
...
python: updates and new munch package
2015-11-12 20:51:47 +01:00
rnhmjoj
03121cd5ac
imv: init at 1.0.0
2015-11-12 19:40:00 +01:00
Frederik Rietdijk
00a1c28c45
python numba: 0.21.0 -> 0.22.1
2015-11-12 12:02:07 +01:00
Frederik Rietdijk
fef06f6875
python munch: init at 2.0.4
2015-11-12 12:01:50 +01:00
Frederik Rietdijk
8f4bd87993
python llvmlite: 0.7.0 -> 0.8.0
2015-11-12 12:01:01 +01:00
Frederik Rietdijk
e41923bb7c
python blaze: 0.8.2 -> 0.8.3
2015-11-12 12:00:41 +01:00
Domen Kožar
2be92ad033
Merge pull request #10975 from NixOS/init-mkcast
...
mkcast: init at 2015-03-13
2015-11-12 11:04:46 +01:00
Nikolay Amiantov
16790fe2f3
Revert "unnethack: move to games section"
...
This reverts commit 160d38711e
.
Never again do "trivial patches" late in the night.
2015-11-12 03:45:51 +03:00
Nikolay Amiantov
160d38711e
unnethack: move to games section
2015-11-12 03:41:53 +03:00
Stéphane Jourdois
a2bf64a381
darwin: ffmpeg-full: add some missing darwin deps
2015-11-11 23:00:11 +01:00
Stéphane Jourdois
b096a863a9
darwin: wavpack: add missing darwin deps
2015-11-11 23:00:10 +01:00
Stéphane Jourdois
eed349522f
darwin: libsndfile: add missing darwin deps
2015-11-11 23:00:10 +01:00
Stéphane Jourdois
00da78070e
darwin: libdc1394: add missing darwin deps
2015-11-11 23:00:10 +01:00
obadz
972381b66a
citrix-receiver: init at 13.2.1, fixes #8458
2015-11-11 22:27:15 +01:00
Pascal Wittmann
bc9ec42958
mkcast: init at 2015-03-13
...
newcast does not work due to
https://github.com/KeyboardFire/mkcast/issues/30
closes #6333
2015-11-11 20:05:03 +01:00
Asko Soukka
0e1094f2d7
darwin: numba: fix build
2015-11-11 20:37:16 +02:00
Franz Pletz
03959d4616
whois: init at 5.2.10 and share with mkpasswd
...
Close #7979 .
This commit adds a much more usable whois tool compared to the ones in
busybox and inetutils.
The sources for whois and mkpasswd from Debian are both located in the whois
git repository for historical reasons.
2015-11-11 15:26:10 +01:00
Vladimír Čunát
e8ee8496e5
Merge #10477 : hdf5: improve options
2015-11-11 15:18:46 +01:00