3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

20011 commits

Author SHA1 Message Date
Benno Fünfstück c0cb70bf7c python-discogs-client: use requests2
This fixes an issue in beets which would depend on two versions of
requests if this used requests and not requests2.
2015-11-16 19:45:06 +01:00
Sander van der Burg a06dd213b6 nodejs-5_0: add package 2015-11-16 17:58:11 +00:00
Florent Becker e61ad1288c emacs-packages.rust-mode: init at 20151026 (close #10674) 2015-11-16 16:46:04 +01:00
Arseniy Seroka 855cba7da7 Merge pull request #11029 from ryantrinkle/mariadb-darwin
Add CoreServices framework dependency to mariadb on darwin
2015-11-16 18:28:23 +03:00
Matthijs Steen 0ceda119d7 google-chrome: init at 45.0.2454.101-1 (close #10892)
As suggested the Google Chrome .deb file that is used for Chromium's plugins is reused.
vcunat removed lots of newlines, as the style was diverging from the
majority far too much (IHHO).
2015-11-16 15:15:51 +01:00
Asko Soukka 5b745f469f scikit-image: init at 0.11.3 (close #10881) 2015-11-16 13:12:43 +01:00
Asko Soukka a69511e298 darwin: llvmlite: add impure dep to fix build 2015-11-16 13:12:43 +01:00
Domen Kožar 88f5cfc126 Merge pull request #8637 from FRidh/statsmodels
python-packages statsmodels: init at 0.6.1
2015-11-16 12:58:17 +01:00
viric 2a7b5e9f30 Merge pull request #11047 from dezgeg/pr-raspi-kheaders-defconfig
platforms.nix: Use bcm2835_defconfig for RPi kernelHeadersBaseConfig
2015-11-16 12:57:10 +01:00
Frederik Rietdijk ce41204fa0 python-packages statsmodels: init at 0.6.1 2015-11-16 12:56:33 +01:00
Domen Kožar 5ca01c71d1 Merge pull request #10814 from NarrativeScience/no_large_file_test
numpy: patch to remove large file test
2015-11-16 12:55:13 +01:00
Domen Kožar 5900949ef2 Merge pull request #9520 from FRidh/bokeh
python-packages bokeh: init at 0.9.3
2015-11-16 12:53:29 +01:00
Frederik Rietdijk ccb3eb13d9 python bokeh: init at 0.10.0 2015-11-16 12:38:21 +01:00
Domen Kožar 76e93b6362 Merge pull request #8868 from lancelotsix/update_pytestflakes
pythonPackages.pytestflakes: 0.2 -> 1.0.0
2015-11-16 12:22:41 +01:00
Domen Kožar c651e6cbe5 pythonPackages.requests: disable on 3.4 2015-11-16 12:19:02 +01:00
Peter Simons e71a080488 Merge pull request #9252 from FRidh/audacity
audacity: 2.0.5 -> 2.1.1
2015-11-16 11:38:46 +01:00
Domen Kožar ae15f96fd1 Merge pull request #11036 from FRidh/pycparser
python pycparser: 2.10 -> 2.14
2015-11-16 11:32:00 +01:00
Domen Kožar 4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Peter Simons 2cb80f7fbc Merge pull request #10865 from NixOS/gnucash26
gnucash 2.6 package, partially broken (no HTML reports)
2015-11-16 11:14:08 +01:00
Tuomas Tynkkynen 6102398d46 platforms.nix: Use bcm2835_defconfig for RPi kernelHeadersBaseConfig
kirkwood_defconfig was removed in the 3.17 kernel release, so
kernelHeadersBaseConfig needs to be changed in order to build
any Raspberry Pi stuff against linuxHeaders_3_18 (which has been the
default since the systemd 227 merge).
2015-11-16 02:37:13 +02:00
Ryan Trinkle 5d4595621d mariadb: fix missing CoreServices framework dependency on darwin 2015-11-15 14:57:06 -05:00
Pascal Wittmann bedaa88a4a Merge pull request #11037 from FlorentBecker/kcov
kcov : init at 29
2015-11-15 19:54:54 +01:00
Florent Becker 7ff5826e08 kcov : init at 29 2015-11-15 18:07:48 +01:00
Pascal Wittmann 52546be521 Merge pull request #11035 from FRidh/pysoundfile
python pysoundfile: init at 0.8.1
2015-11-15 17:58:15 +01:00
Frederik Rietdijk b0f4a36b67 python pycparser: 2.10 -> 2.14 2015-11-15 16:28:38 +01:00
Frederik Rietdijk 4cfe90b9d7 python pysoundfile: init at 0.8.1 2015-11-15 16:24:35 +01:00
zimbatm 71b08ef38e ttyrec: init at 1.0.8 2015-11-15 11:26:56 +01:00
Joachim Schiele 47545e4a23 Merge pull request #10962 from sjourdois/byobu
byobu: 5.87 -> 5.98
2015-11-15 01:02:35 +01:00
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