3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

55810 commits

Author SHA1 Message Date
Mateusz Kowalczyk 8c29f2f948 Merge pull request #8396 from mbakke/rofi
Rofi updates
2015-06-19 15:25:07 +01:00
Mateusz Kowalczyk fc26e89159 Merge pull request #8394 from mbakke/maim
Add maim and slop
2015-06-19 15:22:20 +01:00
Luca Bruno 6551af69eb add tk-8_5 and fix xconq (XHF) 2015-06-19 16:06:10 +02:00
Robin Gloster 45be5244a4 Wrap the python scripts in lxc 2015-06-19 14:34:09 +02:00
Eelco Dolstra ffb70f9c51 Don't use camelCase in file names 2015-06-19 14:29:09 +02:00
Thomas Tuegel a457d29def Merge pull request #8408 from bendlas/update-dropbox-unstable
dropbox: 3.4.6 -> 3.6.7
2015-06-19 07:24:03 -05:00
Luca Bruno 005837d85f remove duplicated gtk-vnc 2015-06-19 14:19:27 +02:00
Luca Bruno d92ce0d552 guix: use libgcrypt_1_5, fix compilation but not tests (ZHF) 2015-06-19 14:16:07 +02:00
Eelco Dolstra fef6141662 Revert "procps-ng: Refactor a bit"
This reverts commit dceff137e1. It was
described as a "refactoring", but actually made procps depend on
systemd (which is a heavy dependency) and changed the name of the
package.
2015-06-19 14:14:52 +02:00
Eelco Dolstra d8c9fa5043 Remove meta.license hack 2015-06-19 14:14:52 +02:00
Herwig Hochleitner ab7c9e49c2 dropbox: 3.4.6 -> 3.6.7 2015-06-19 13:50:42 +02:00
Jaka Hudoklin ef1f827671 skydns: update to 2.5.0a 2015-06-19 13:35:32 +02:00
Jaka Hudoklin f1480c8296 goPackages: fix influxdb8 and related packages 2015-06-19 13:23:55 +02:00
William A. Kennington III 6f4fbcc981 dnsmasq: Fix build 2015-06-19 00:54:41 -07:00
William A. Kennington III be9a0a8943 logrotate: 3.8.9 -> 3.9.1 2015-06-18 23:52:33 -07:00
William A. Kennington III ad9081411c kmod: 20 -> 21 2015-06-18 23:51:12 -07:00
William A. Kennington III fe03404ade Merge pull request #8382 from DamienCassou/update-pinentry-0.9.4
pinentry: 0.9.1 -> 0.9.4
2015-06-18 23:36:33 -07:00
William A. Kennington III 0952b37177 lightdm-gtk-greeter: 2.0.0 -> 2.0.1 2015-06-18 23:04:56 -07:00
William A. Kennington III 588d20ea39 opensc: 0.14.0 -> 0.15.0 2015-06-18 22:59:38 -07:00
William A. Kennington III dbed487998 rabbitmq-c: 0.6.0 -> 0.7.0 2015-06-18 22:55:12 -07:00
William A. Kennington III b8f3c4c659 ttylog: 0.25 -> 0.26 2015-06-18 22:52:44 -07:00
William A. Kennington III a41a8cee03 tevent: 0.9.24 -> 0.9.25 2015-06-18 22:48:43 -07:00
William A. Kennington III 66c6b8543a tdb: 1.3.4 -> 1.3.6 2015-06-18 22:46:11 -07:00
William A. Kennington III c64747c44a mumble: 1.2.8 -> 1.2.9 2015-06-18 22:34:55 -07:00
William A. Kennington III 8b7d3127b5 efibootmgr: 0.11.0 -> 0.12 2015-06-18 22:34:43 -07:00
William A. Kennington III 5668e3911c efivar: Fix linking against libdl 2015-06-18 22:34:29 -07:00
William A. Kennington III a8d04d9d1b libraw: 0.16.0 -> 0.16.1 2015-06-18 22:20:22 -07:00
William A. Kennington III 549eb64bc3 libinput: 0.15.0 -> 0.17.0 2015-06-18 22:19:59 -07:00
William A. Kennington III 99dea2b61a libssh2: 1.5.0 -> 1.6.0 2015-06-18 22:13:56 -07:00
William A. Kennington III 81636c4e60 dosfstools: 3.0.26 -> 3.0.28 2015-06-18 22:06:59 -07:00
William A. Kennington III 0b9419f4a9 efivar: 0.15 -> 0.20 2015-06-18 22:03:00 -07:00
William A. Kennington III bdeac100db dnsmasq: 2.72 -> 2.73 2015-06-18 21:56:18 -07:00
William A. Kennington III 2f63137a44 lvm2: 2.02.118 -> 2.02.120 2015-06-18 21:50:53 -07:00
William A. Kennington III af178cbc4e bluez: 5.30 -> 5.31 2015-06-18 21:50:39 -07:00
William A. Kennington III d5e841765e mbedtls: 1.3.10 -> 1.3.11 2015-06-18 21:50:29 -07:00
William A. Kennington III 1bb39e282d nvidia-x11: 346 -> 352.21 2015-06-18 21:45:51 -07:00
William A. Kennington III 7aa425e541 lftp: 4.6.1 -> 4.6.3a 2015-06-18 21:39:39 -07:00
William A. Kennington III 14792f12d6 mongodb: 3.0.3 -> 3.0.4 2015-06-18 21:35:12 -07:00
William A. Kennington III 6c4dad1692 wiredtiger: 2.6.0 -> 2.6.1 2015-06-18 21:34:46 -07:00
William A. Kennington III 7fd80890c7 git: 2.4.2 -> 2.4.4 2015-06-18 21:24:46 -07:00
William A. Kennington III 4468d52cbb libndp: 1.4 -> 1.5 2015-06-18 21:19:33 -07:00
William A. Kennington III c0b553c12c zeromq: 4.1.1 -> 4.1.2 2015-06-18 21:17:51 -07:00
William A. Kennington III d8c746601e libjpeg-turbo: 1.4.0 -> 1.4.1 2015-06-18 21:17:36 -07:00
Marcell Vazquez-Chanlatte d05873a509 bump version of taskwarrior 2.4.0 -> 2.4.4 2015-06-18 23:28:01 -04:00
William A. Kennington III 3a60e40d9b nix-serve: Update 2015-06-18 19:29:39 -07:00
Marius Bakke 7d79028456 rofi-pass: rename to rofi-pass 2015-06-18 23:32:58 +01:00
Marius Bakke bb1ea06dd8 rofi 0.15.2 -> 0.15.5 2015-06-18 23:32:58 +01:00
Marius Bakke 10ff6c3fe0 new package: slop 2015-06-18 22:55:56 +01:00
Marius Bakke 3d68e0b0e2 new package: maim 2015-06-18 22:13:06 +01:00
Andrew Kelley 8925d17034 add myself as maintainer 2015-06-18 11:52:39 -07:00
Thomas Tuegel 5c7fb3a9b5 haskell-bindings-levmar: build with openblasCompat 2015-06-18 12:58:16 -05:00
lethalman 4239b7fe0a Merge pull request #8387 from dezgeg/pr-tmux
tmux: Homepage & releases no longer hosted at sourceforge
2015-06-18 18:48:31 +02:00
Vincent Laporte 710b3e6d79 proj: add myself as maintainer 2015-06-18 18:41:52 +02:00
Austin Seipp c3fcd5ecb7 nixpkgs: Remove bunk 'infer' expression
This was accidentally committed because I'm a goof - see
1ee742b0ef.

Thanks to ftrvxmtrx on IRC for spotting.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-18 11:37:51 -05:00
Austin Seipp a0301e9ce2 nixpkgs: saw-tools 0.1-20150609
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-18 11:37:51 -05:00
Vincent Laporte d691bf0d4f proj: update from 4.8.0 to 4.9.1 (close #8235) 2015-06-18 17:05:27 +02:00
Tuomas Tynkkynen 0a597ec094 tmux: Homepage & releases no longer hosted at sourceforge 2015-06-18 17:44:41 +03:00
goibhniu 43a8793555 Merge pull request #8383 from hrdinka/update/darktable
darktable: update 1.6.6 -> 1.6.7
2015-06-18 15:57:50 +02:00
Jascha Geerds 124c2b14bb vdirsyncer: 0.4.3 -> 0.5.2 2015-06-18 15:17:22 +02:00
Jascha Geerds 9df19f6c0a requests_toolbelt: 0.3.0 -> 0.4.0 2015-06-18 15:17:22 +02:00
Jascha Geerds 3b00ee2228 Add setuptools_scm package 2015-06-18 15:17:22 +02:00
lethalman 0243472c05 Merge pull request #8344 from joachifm/redundant-cheetah
Delete redundant expression cheetahTemplate
2015-06-18 14:51:17 +02:00
Vladimír Čunát ddeb2f5cce firefox: fix file-dialogs and icons with gtk3
There was the usual crashing and a few icons missing.
@lethalman: I think it's best to start putting $XDG_ICON_DIRS into suffix
instead of prefix (as here), so user-installed icons take precedence.

/cc #7743.
2015-06-18 14:48:41 +02:00
lethalman af4c5f9cc4 Merge pull request #8249 from joachifm/clamav-milter
clamav: build mail filter
2015-06-18 14:47:17 +02:00
lethalman da28405ba2 Merge pull request #8263 from robbinch/pkg-dvd-slideshow
dvd-slideshow: Add package.
2015-06-18 14:46:48 +02:00
lethalman e5f9ffbb99 Merge pull request #8267 from hiberno/bump-xcape
xcape: bump to latest revision
2015-06-18 14:46:06 +02:00
lethalman aeca954e3f Merge pull request #8381 from hrdinka/update/nsd
nsd: update 4.1.1 -> 4.1.2
2015-06-18 14:45:12 +02:00
Peter Simons 7e0a7d97b4 Merge pull request #8380 from michelk/R/update
R: update to 3.2.1
2015-06-18 14:41:22 +02:00
Cillian de Róiste fd799c878e setbfree: update from 0.7.5 to 0.8.0 2015-06-18 14:22:17 +02:00
Christoph Hrdinka fe010d893d darktable: update 1.6.6 -> 1.6.7 2015-06-18 14:13:27 +02:00
Damien Cassou e88de8308b pinentry: 0.9.1 -> 0.9.4 2015-06-18 14:11:55 +02:00
Christoph Hrdinka 7b207ab10b nsd: update 4.1.1 -> 4.1.2 2015-06-18 14:08:39 +02:00
Michel Kuhlmann 46d46fd05a R: update to 3.2.1 2015-06-18 14:00:29 +02:00
Andrew Kelley 801a392932 groovebasin: init at 1.5.1 2015-06-18 12:31:17 +02:00
Siarhei Zirukin d59aee7406 efl, elementary: 1.14.0 -> 1.14.1, closes #8242 2015-06-18 12:29:20 +02:00
Vincent Laporte 2583b22573 frama-c: fix hash, closes #8308 2015-06-18 11:47:34 +02:00
Vincent Laporte 2205847614 ocaml-menhir: update from 20130116 to 20140422 2015-06-18 11:47:28 +02:00
taku0 4e78d76c18 thunderbird-bin: update to version 38.0.1, closes #8357 2015-06-18 11:40:13 +02:00
lassulus 4ed0a4eaf8 add pkg: vbam, closes #8339 2015-06-18 11:35:43 +02:00
Daiderd Jordan 8dba95502d wxmac: fixed impure libiconv, closes #8367 2015-06-18 11:34:18 +02:00
Daiderd Jordan b66942702b erlang: use wxmac on darwin 2015-06-18 11:34:05 +02:00
Daiderd Jordan 8a07499620 wxmac: new package
- based on the current homebrew package
2015-06-18 11:34:05 +02:00
Daiderd Jordan f119508140 darwin os-specific: rez and derez packages 2015-06-18 11:34:05 +02:00
lassulus 099923c7be add pkgs: zandronum, zandronum-{server,bin}, closes #8338 2015-06-18 11:29:03 +02:00
lassulus 24dc9d7160 add pkgs: fmod42416 2015-06-18 11:28:52 +02:00
lassulus 03f0f41db5 add pkgs: sqlite-amalgamation 2015-06-18 11:28:52 +02:00
hiberno deadb4e0aa tor-browser: update 4.5.1 to 4.5.2, closes #8379 2015-06-18 11:25:32 +02:00
Benjamin Saunders cec71a01d9 libuv: 1.5.0 -> 1.6.1, closes #8365 2015-06-18 11:23:04 +02:00
Christian Theune b2b7245155 Update syncthing to 0.11.9 2015-06-18 11:19:05 +02:00
lethalman 0622c4a22d Merge pull request #8350 from bobvanderlinden/drive
added drive package
2015-06-18 11:09:13 +02:00
Rok Garbas ca407f3738 xdg_utils: fixing some of the impurities in xdg-utilso, #8377 2015-06-18 10:51:35 +02:00
Vladimír Čunát c4406c585c makeDesktopItem: don't generated a deprecated key
Fixes #4319. We even seem we never override it anywhere.
http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html#deprecated-items
2015-06-18 10:31:48 +02:00
William A. Kennington III 8f63b5e89e Merge pull request #8359 from NixOS/fix-CVE-2015-4143
wpa_supplicant: fix CVE-2015-4143
2015-06-17 20:35:41 -07:00
William A. Kennington III 8a13108d42 Merge pull request #8376 from eduarrrd/rsyslog
rsyslog: 8.9.0 -> 8.10.0
2015-06-17 20:34:27 -07:00
Eduard Bachmakov e6f81661aa rsyslog: 8.9.0 -> 8.10.0 2015-06-17 21:59:54 -04:00
William A. Kennington III 2ae75f3a85 gnutls: 3.4.1 -> 3.4.2 2015-06-17 18:33:10 -07:00
William A. Kennington III ebb2e41611 openldap: Add gcc5 compat patch 2015-06-17 17:51:12 -07:00
Tobias Geerinckx-Rice 4e5e44140b dpkg, x2goclient: fix evaluation
Bed time.
2015-06-17 23:25:09 +02:00
Peter Simons bb42c215e2 R: improve support for CRAN and Bioconductor package sets
- Update the instructions for re-generating each of the package set files.
 - Provide test-evaluation.nix expression to verify that the package sets evaluates.
 - Update list of known broken packages.
2015-06-17 23:19:56 +02:00
Jeffrey David Johnson 93a742fd28 R: add support for Bioconductor packages 2015-06-17 23:19:56 +02:00
Peter Simons 84235ff763 haskell-xkbcommon test suite has unspecified dependencies. 2015-06-17 23:17:54 +02:00
Peter Simons b8446a4d85 haskell: update configuration for Cabal 1.22.4.0 2015-06-17 23:17:54 +02:00
Peter Simons ef421d6f9b hackage-packages.nix: update to 0a97083894 with hackage2nix revision 1663fb81050a8be440e74263f022c7b04d3ccd6b 2015-06-17 23:17:48 +02:00
Tobias Geerinckx-Rice c544a2b74b nxproxy: add patch file... 2015-06-17 22:24:12 +02:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Bob van der Linden 361cf81f30 goPackages: oauth2: use propagatedBuildInputs instead of extraSrcs 2015-06-17 20:13:49 +02:00
Bob van der Linden 5093fd9cc9 added drive package 2015-06-17 20:13:48 +02:00
Rok Garbas 3d2a2fdd6f pythonPackages: pelican upgrade to 3.6.0 and added ghp-import package
- added ghc-import, smartypants and typogrify packages. last 2 needed as
  a dependency for pelican buildInputs
- updated pelican to 3.6.0 and enable tests
- added myself (garbas) as maintainer to bunch of packages which I use.
- removed usage if python.isPypy and replace it with isPyPy
2015-06-17 17:55:53 +02:00
lethalman ff3972b217 Merge pull request #8349 from berdario/ansible-win
Add support for Windows in ansible
2015-06-17 16:09:37 +02:00
Mateusz Kowalczyk 6563dd251f tibia: update to 10.79 2015-06-17 14:44:44 +01:00
lethalman 72e59b1047 Merge pull request #8362 from bobvanderlinden/fix-grpc
goPackages: grpc: fix dependencies so that grpc builds
2015-06-17 15:20:37 +02:00
Peter Simons 75f82f50e6 Merge pull request #5908 from cstrahan/hoogle-local-ng
haskell-ng: hoogleLocal support

I believe this code ought to be used as follows:

    {
        packageOverrides = pkgs : let self = pkgs.pkgs; in rec {

        hsEnv = pkgs.haskell-ng.packages.ghc784.ghcWithPackages (p: with p;
                (haskellDev p) 
                ++(myPackages p) 
                # add more packages here
                );
        hsEnvHoogle = withHoogle hsEnv;

        withHoogle = haskellEnv: with pkgs.haskellngPackages;
         import <nixpkgs/pkgs/development/libraries/haskell/hoogle/local.nix> {
          stdenv = pkgs.stdenv;
          inherit hoogle rehoo ghc;
          packages = haskellEnv.paths;
        };
      };
    }
2015-06-17 15:07:07 +02:00
Domen Kožar 101cdcc11a Merge pull request #8361 from brodul/scrolls2
Update scrolls client (src hash change)
2015-06-17 15:02:31 +02:00
Tobias Geerinckx-Rice d7530a0630 nxproxy: nxcomp: fix "negotiation in stage 10" error
Apply backported upstream patch.
2015-06-17 14:03:16 +02:00
lethalman c1f7f6df4c Merge pull request #8366 from andrewrk/rhash
expose librhash
2015-06-17 13:01:18 +02:00
Andrew Kelley bb2d249706 expose librhash 2015-06-17 03:01:26 -07:00
Peter Simons fcd7b6829b nix-repl: bump version to add support for current versions of Nix 2015-06-17 11:11:25 +02:00
William A. Kennington III 8310045b14 Add missing patch 2015-06-16 23:56:15 -07:00
William A. Kennington III 061887e38a xf86-video-intel: Kernel 4.0 match 2015-06-16 23:37:05 -07:00
Charles Strahan af21595eca ghcjs: fix/bump git refs 2015-06-16 21:26:11 -04:00
Ricardo M. Correia 5ab96e6e2b Merge pull request #8346 from joachifm/electrum-2_3_2
electrum: 2.0.4 -> 2.3.2
2015-06-17 02:41:45 +02:00
William A. Kennington III bc4e1f3c1a inetutils: 1.9.3 -> 1.9.4 2015-06-16 15:20:28 -07:00
William A. Kennington III 01c2ad2525 screen: 4.2.1 -> 4.3.0 2015-06-16 14:28:12 -07:00
Bob van der Linden 6cd67cb218 goPackages: grpc: fix dependencies so that grpc builds 2015-06-16 22:20:00 +02:00
Andraz Brodnik 21bb2caf78 Update scrolls client (src hash change) 2015-06-16 21:02:48 +02:00
Pascal Wittmann f8df92efbe scala-mode2: fix hash 2015-06-16 20:22:55 +02:00
Pascal Wittmann 7d7a5e9f0e add osmo, a handy personal organizer 2015-06-16 20:13:20 +02:00
Pascal Wittmann b73a9a0b68 add libgringotts, a library to encapsulate data in an encrypted structure 2015-06-16 20:13:20 +02:00
Pascal Wittmann 7c4a0eaa53 wpa_supplicant: fix CVE-2015-4143
see http://www.openwall.com/lists/oss-security/2015/05/09/6
2015-06-16 17:28:35 +02:00
Luca Bruno e37340b49a gnome-pomodoro: move from apps to misc 2015-06-16 15:26:37 +00:00
Luca Bruno 3b2c44fc74 vinagre: add new gnome app 2015-06-16 15:14:41 +00:00
Luca Bruno de142fe63e gtk-vnc: add new lib for gnome 2015-06-16 15:14:41 +00:00
Jascha Geerds 55227b330f khal: 0.4.0 -> 0.5.0 2015-06-16 15:16:06 +02:00
Jascha Geerds 07cdc40222 Merge pull request #7872 from matthiasbeyer/fix-khal_python
Fix: khal 0.4.0 does not work with python 3
2015-06-16 15:06:42 +02:00
Pascal Wittmann d2ad04cd38 add california, a calendar application for gnome 2015-06-16 14:57:20 +02:00
Peter Simons 8a8ed5fa1b ghcjs: unbreak syntax highlighting in Emacs 2015-06-16 13:02:28 +02:00
Peter Simons fbe153989c ghcjs: mark broken
The build has been failing for quite some time.
2015-06-16 13:02:28 +02:00
Peter Simons 90c3d380d1 haskell-wai-session: package is broken 2015-06-16 13:02:27 +02:00
Peter Simons 6390ea5026 haskell-serversession-backend-redis: disable failing test suite 2015-06-16 13:02:27 +02:00
Peter Simons 614769a9ed haskell-serversession: disable failing test suite 2015-06-16 13:02:27 +02:00
Peter Simons 19c5b0a8cd hackage-packages.nix: update to a6e45bb640 with hackage2nix revision 6c4694e3e3d2f6135be35b967f6f459a01789604 2015-06-16 13:02:22 +02:00
Peter Simons 362e60a5dc r-modules: fix rapportools 2015-06-16 12:48:50 +02:00
Peter Simons 21c18c4f0a r-modules: fix rapport 2015-06-16 12:48:50 +02:00
Peter Simons ccd6988b3d r-modules: fix xml2 2015-06-16 12:48:50 +02:00
Peter Simons 8ac6350ce7 r-modules: fix pander 2015-06-16 12:48:50 +02:00
Peter Simons 9fc5317055 r-modules: fix curl 2015-06-16 12:48:50 +02:00
Peter Simons d4c810cccd r-modules: disable broken packages to avoid Hydra evaluation errors 2015-06-16 12:48:49 +02:00
Peter Simons c9743be445 nlopt: broken by recent octave 4.x update
See http://hydra.cryp.to/build/932458/nixlog/1/raw for a complete build log.
The issue is known upstream at https://github.com/stevengj/nlopt/issues/33.
2015-06-16 12:48:49 +02:00
Cillian de Róiste a2a69400a4 jmtpfs: add platform 2015-06-16 11:30:20 +02:00
Tobias Geerinckx-Rice 368e381d1f python-packages: prompt_toolkit -> 0.40
Fixes:
- Fix in output_screen_diff: reset correctly.
- Ignore flush errors in vt100_output.
- Implemented <num>gg Vi key binding.
- Bug fix in the renderer when the style changes.

New features:
- TokenListControl can now display the cursor somewhere.
- Added SwitchableValidator class.
- print_tokens function added.
- get_style argument for Application added.
- KeyBindingManager got an enable_all argument.

Backwards incompatible changes:
- history_search is now a SimpleFilter instance.
2015-06-16 03:34:42 +02:00
Tobias Geerinckx-Rice 82ec18463d Add dfasma 1.0.1: analyse/compare audio files 2015-06-16 03:15:15 +02:00
Domen Kožar 28a586de4d Merge pull request #8335 from andrewrk/libgroove
add libgroove package
2015-06-16 00:46:01 +02:00
Arseniy Seroka b83d53e355 vimPlugins: 2015-06-16 update 2015-06-16 01:44:35 +03:00
Arseniy Seroka 4cd061abfd Merge pull request #8270 from LnL7/youcompleteme-clang
removed clang-unwrapped in vimPlugins.youcompleteme
2015-06-16 00:25:48 +02:00
Joachim Fasting ed554d5ae2 Delete redundant expression cheetahTemplate
Use the one provided by python-packages instead; retain the
top-level cheetahTemplate name as an alias.
2015-06-15 23:31:37 +02:00
Arseniy Seroka ac49b0a0c0 Merge pull request #8336 from ericbmerritt/ocp-build-fix
ocp-build: upgrade to 1.99.9-beta
2015-06-15 22:43:36 +02:00
Arseniy Seroka 8a23f0eba0 Merge pull request #8345 from joachifm/reimplement-picolisp
Re-define picolisp
2015-06-15 22:43:03 +02:00
Daiderd Jordan 06d49aa696 vimPlugins.youcompleteme: use clang instead of clang-unwrapped on darwin 2015-06-15 22:38:56 +02:00
Tobias Geerinckx-Rice e8dea0c5c2 fmit -> 1.0.0 2015-06-15 21:34:30 +02:00
Andrew Kelley ede08cec4d add libgroove package 2015-06-15 12:27:40 -07:00
Dario Bertini 32616ae028
Add pywinrm metadata 2015-06-15 19:45:49 +01:00
Dario Bertini 1c87fd82d4
Fix python-packages.nix conflict
Merge remote-tracking branch 'origin/master' into ansible-win
2015-06-15 19:41:30 +01:00
William A. Kennington III 046ba6b7db linux-testing: 4.1-rc7 -> 4.1-rc8 2015-06-15 11:37:05 -07:00
William A. Kennington III 2fd74f43b5 kernel: 3.18.14 -> 3.18.16 2015-06-15 11:32:46 -07:00
William A. Kennington III b325c1556a kernel: 3.12.43 -> 3.12.44 2015-06-15 11:32:46 -07:00
Peter Simons b667cb6163 Merge pull request #8298 from abbradar/r-updates
R updates
2015-06-15 20:31:57 +02:00
Peter Simons 953d867437 Merge pull request #8341 from phile314/master
haskell-uhc: Use newer version with relaxed cabal constraints.
2015-06-15 20:29:56 +02:00
Dario Bertini 99912bbf0e
Add (optional, but opted in by default) support for Windows in ansible 2015-06-15 19:24:02 +01:00
Tobias Geerinckx-Rice 553ce28bc2 geolite-legacy -> 2015-06-15 2015-06-15 19:58:20 +02:00
Tobias Geerinckx-Rice a0473fde87 tzdata -> 2015e 2015-06-15 19:30:11 +02:00
Peter Simons b311380227 hackage-packages.nix: update to 2c4a8914cb with hackage2nix revision c519a8ee5f75311f8eaaca7eaf5af8f7ad26d33e 2015-06-15 19:26:56 +02:00
Joachim Fasting 18421542f9 electrum: 2.0.4 -> 2.3.2 2015-06-15 15:31:06 +02:00
Philipp Hausmann d95fba3746
haskell-uhc: Use newer version with relaxed cabal constraints. 2015-06-15 10:47:53 +02:00
Pascal Wittmann 5af468d0bc libmspack: update from 0.4alpha to 0.5alpha
fixes CVE-2014-9732, CVE-2015-4467, CVE-2015-4468, CVE-2015-4469,
CVE-2015-4470, CVE-2015-4471 and CVE-2015-4472.
2015-06-15 10:10:51 +02:00
William A. Kennington III fa5eb0a7da rethinkdb: 2.0.0-1 -> 2.0.3 2015-06-14 20:00:21 -07:00
Peter Simons 82fe884dc0 Merge pull request #8323 from ftrvxmtrx/mpg123-1.22.2
mpg123: 1.19.0 -> 1.22.2
2015-06-15 18:24:54 +02:00
Tuomas Tynkkynen 2c9b93b01c i2c-tools: New package at version 3.1.1 2015-06-15 17:49:35 +02:00
Tuomas Tynkkynen 7233ca0488 read-edid: New package at version 3.0.2 2015-06-15 17:49:35 +02:00
Tuomas Tynkkynen 5a5a5ade0f libx86: Add patch from debian to fix build on ARM
Without this, the build fails even with x86emu:

make LIBRARY=static static
make[1]: Entering directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1'
gcc -O2 -Wall -DDEBUG -g   -c -o x86-common.o x86-common.c
gcc -O2 -Wall -DDEBUG -g   -c -o thunk.o thunk.c
thunk.c: In function 'x_inb':
thunk.c:40:9: error: impossible constraint in 'asm'
         __asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); \
         ^
thunk.c:44:1: note: in expansion of macro '__BUILDIO'
 __BUILDIO(b,b,char)
 ^
<builtin>: recipe for target 'thunk.o' failed
make[1]: *** [thunk.o] Error 1
make[1]: Leaving directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1'
Makefile:17: recipe for target 'default' failed
make: *** [default] Error 2
2015-06-15 17:49:35 +02:00
Shea Levy dbf1e0fb53 Merge branch 'update-gnupg-2.1.5' of https://github.com/DamienCassou/nixpkgs 2015-06-15 10:07:43 -04:00
Shea Levy 2d3933151b Merge remote-tracking branch 'origin/fix-CVE-2015-4171' 2015-06-15 09:56:14 -04:00
Damien Cassou c2116191d3 gnupg 2.1.4 -> 2.1.5
According to someone on #gnupg, the patch is not necessary anymore.
2015-06-15 15:42:23 +02:00
koral 6c213c6e44 rmlint: 2.1.0 -> 2.2.0 (closes #8268) 2015-06-15 15:35:37 +02:00
Luca Bruno b36629d821 gnome3: also pass self to overridePackages function 2015-06-15 11:52:26 +02:00
Luca Bruno cc5663de0c gnome3: easier to override packages 2015-06-15 11:47:50 +02:00
Domen Kožar e0100a0f8d Merge pull request #8297 from rycee/fonts-remove-builderDefsPackage
Remove use of builderDefsPackage in font packages.
2015-06-15 11:44:36 +02:00
Vladimír Čunát 6c382151fb imagemagick: remove mirrors that don't work
/cc #8302.
2015-06-15 11:30:28 +02:00
Pascal Wittmann f4d7b23a68 tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111
Using the prerelease version, because there was no response on when a
new official release will happen, see
http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html
2015-06-15 11:07:02 +02:00
Austin Seipp 2dfb657b94 nixpkgs: picosat 936 -> 960, add myself as a maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:12 -05:00
Austin Seipp 44ef5a3ab0 cvc4: regenerate ./configure on rebuild
Otherwise some absurd error from ./configure crops up.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Austin Seipp da76434dbd nixpkgs: yices 2.2.1 -> 2.3.1, now with source
It's still under a non-commercial license, but the source build is waay
better than the binary build. Can probably work on OS X too now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Austin Seipp 3d181a3175 nixpkgs: abc-verifier 20150406 -> 20150614
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Austin Seipp 6cfc2caaeb nixpkgs/cvc4: touchups, add myself as maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-14 19:48:11 -05:00
Henry Till faa90fad3f mr: update from 1.20141024 to 1.20150503 2015-06-14 22:54:31 +02:00
Mateusz Kowalczyk b32a78a97a Merge pull request #8326 from Chattered/master
Add Tales of Maj'eyal game.
2015-06-14 21:53:36 +01:00
Eric Merritt dcffd28527 ocp-build: upgrade to 1.99.9-beta
This also allows ocp-build to build for ocaml 4.02 and greater
2015-06-14 13:33:18 -07:00
Jonathan Rudenberg 853e87909f makemkv: 1.9.3 -> 1.9.4 2015-06-14 16:31:29 -04:00
Michael Raskin d9354c6a2a Add xwinmosaic window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin 649b0affe1 Adding Skippy-XD window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin a6d54b3fdd A comment about the license 2015-06-14 23:26:58 +03:00