3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

72130 commits

Author SHA1 Message Date
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
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
Tobias Geerinckx-Rice a2f98ef4ac clipgrab 3.5.2 -> 3.5.4 2015-11-13 22:06:10 +01:00
noctuid b0fd85342b zscroll: init at 1.0 2015-11-13 14:58:19 -05:00
Peter Simons 67271da8cb Merge pull request #11011 from ikervagyok/xmonad
fix: ihaskell's and xmonad's dependence on haskell-ng
2015-11-13 20:37:07 +01:00
William A. Kennington III 64f31fbc35 xf86-video-intel: 2015-11-10 -> 2015-11-13 2015-11-13 10:37:27 -08:00
Lengyel Balázs 162542bf8f fix: ihaskell's and xmonad's dependence on haskell-ng 2015-11-13 19:14:40 +01:00
Frederik Rietdijk 31563a291c python bcrypt: 1.0.2 -> 2.0.0 2015-11-13 17:05:28 +01:00
Arseniy Seroka 3087ef37bb Merge pull request #10807 from joachifm/fix-hyperdex-hashes
hyperdex: blindly fix hashes of local dependencies
2015-11-13 17:48:08 +03:00
Arseniy Seroka 83ce6db83b Merge pull request #10771 from demin-dmitriy/pulseaudio-panel-plugin
xfce4-pulseaudio-plugin: init at 0.2.3
2015-11-13 17:47:00 +03: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 2d478090b5 Merge pull request #10972 from matthiasbeyer/update-dwm
dwm: 6.0 -> 6.1
2015-11-13 17:43:06 +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 9dd3e5fd3f Merge pull request #10993 from oxij/nixos-actkbd-tinyfix
[trivial] nixos: add actkbd package to environment in actkbd module
2015-11-13 17:39:44 +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
Arseniy Seroka f0630abb0d Merge pull request #11008 from makefu/snapraid_init_master
snapraid: init at 8.1
2015-11-13 17:36:28 +03:00
Tobias Geerinckx-Rice 519d18b063 libpsl: list 2015-10-11 -> 2015-11-12 2015-11-13 15:07:34 +01: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
Nikolay Amiantov d3c82934f8 pcsclite: fix pcsc-spy 2015-11-13 15:28:37 +03:00
Damien Cassou 965fbcc419 elisp-ffi: init at git 2014-11-03 2015-11-13 08:23:14 -03:00
Pascal Wittmann 3a4a0f7d03 calibre: 2.43.0 -> 2.44.0 2015-11-13 12:04:26 +01:00
Peter Simons ae3a030fe8 Merge pull request #11000 from Ericson2314/patch-1
ghcjs: update comment on generating built-in pkg list
2015-11-13 11:40:24 +01:00
Pascal Wittmann 46979454e3 Merge pull request #11002 from odi/master
python-packages: pafy 0.4.1 -> 0.4.2
2015-11-13 10:50:29 +01:00
Oliver Dunkl 928e202034 python-packages: pafy 0.4.1 -> 0.4.2 2015-11-13 09:29:55 +01:00
James Cook 225642e25a Update comment for gdm service.
Emphasize experimental nature slightly less, but say it's only really
tested with Gnome.
2015-11-12 20:58:43 -08:00
John Ericson 53e43204f9 ghcjs: update comment on generating built-in pkg list
Should we do `import (runCommand ...)` to automate this?
2015-11-12 16:47:41 -08:00
vbgl c14eca68a4 Merge pull request #10965 from sjourdois/cgal
cgal: 4.6.1 -> 4.7
2015-11-13 00:07:04 +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
Peter Simons aee2e72122 Haskell math-functions is broken on Hydra again. :-( 2015-11-12 22:31:03 +01:00
Peter Simons 4856880cab hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: 7c001f31b0
  - Hackage: 46f2de463b
  - LTS Haskell: 1ae555e197
  - Stackage Nightly: 4113b2e369
2015-11-12 22:30:54 +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 95a723d516 nixos: add actkbd package to environment in actkbd module 2015-11-12 21:05:07 +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 69c6aa5c1b Merge pull request #10989 from rnhmjoj/maintainer
add myself as a maintainer
2015-11-12 20:52:50 +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
rnhmjoj d9274215e7 add myself as a maintainer 2015-11-12 19:25:15 +01:00
Arseniy Seroka 95396d9dbb Merge pull request #10985 from hrdinka/update/nsd
nsd: 4.13 -> 4.16
2015-11-12 18:06:49 +03:00