1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

4036 commits

Author SHA1 Message Date
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Vladimír Čunát f86392bfbe chromium: fixup share/share
Reported on https://github.com/NixOS/nixpkgs/issues/11501#issuecomment-164383204
2016-08-27 17:38:25 +02:00
Lluís Batlle i Rossell 8d4de4fe4f Updating mumble to 1.2.16. 2016-08-27 15:46:33 +02:00
Erik Rybakken 5212eb3882 neomutt: 20160723 -> 20160827 2016-08-27 10:37:53 +02:00
Eelco Dolstra c2fb3490c9 firefox: 48.0.1 -> 48.0.2 2016-08-26 16:46:34 +02:00
Joachim F 9f01bb755f Merge pull request #17987 from taku0/firefox-bin-48.0.2
firefox-bin: 48.0.1 -> 48.0.2
2016-08-26 15:44:04 +02:00
Graham Christensen 8512747ca5 Merge pull request #17980 from puffnfresh/package/hipchat
hipchat: 4.26.0.1655 -> 4.26.0.1657
2016-08-25 08:16:10 -04:00
J Phani Mahesh d228789e58 add cross-referencing notes to alpine and realpine 2016-08-25 11:58:45 +05:30
J Phani Mahesh cd3d8eee85 realpine:configure: allow using passfile 2016-08-25 11:55:31 +05:30
Brian McKenna b3ed6b9509 hipchat: 4.26.0.1655 -> 4.26.0.1657 2016-08-25 15:22:48 +10:00
Franz Pletz 4f46913bf7 wraith: disable format hardening 2016-08-25 03:55:19 +02:00
Franz Pletz df275f5b85 treewide: fix darwin builds by referring to stdenv's libc 2016-08-25 02:56:25 +02:00
Joachim F 20b4c8726a Merge pull request #17948 from peterhoeg/st_0145
syncthing: 0.14.4 -> 0.14.5
2016-08-24 20:19:13 +02:00
taku0 0536cc397c firefox-bin: 48.0.1 -> 48.0.2 2016-08-25 03:12:12 +09:00
Domen Kožar 9334e54f60 Merge pull request #17961 from k0001/zoom-us-fix
zoom-us: fix url
2016-08-24 18:36:32 +02:00
Renzo Carbonara 6d46dcc9a7 zoom-us: fix url 2016-08-24 12:23:36 -03:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Franz Pletz c0fa26ef3b Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-08-24 11:01:53 +02:00
Peter Hoeg 6723f899f1 syncthing: 0.14.4 -> 0.14.5 2016-08-24 08:40:44 +08:00
Nikolay Amiantov 76223aa4b2 qutebrowser: add pdfjs support 2016-08-23 23:36:18 +03:00
obadz cd063d774e chromium: fix "Aw, snap!" after glibc 2.24 upgrade
See https://bugzilla.redhat.com/show_bug.cgi?id=1361157#c8
cc @domenkozar @aszlig
2016-08-23 11:56:11 +01:00
Eelco Dolstra 1100490362 Merge pull request #17932 from puffnfresh/package/hipchat
hipchat: 4.0.1641 -> 4.26.0.1655
2016-08-23 11:27:21 +02:00
Lluís Batlle i Rossell 9ef3a51379 Adding vlc plugin for firefox.
I really wanted it to substitute the html5 player, or at least the direct
player for mp4/webm files in firefox, but I couldn't make it work. The
formats recognized by the firefox internal player were used in all cases. The
plugin worked for formats unknown by firefox.

https://support.mozilla.org/ca/questions/1089501

Nevertheless, as I wrote the nix recipe, I commit it. It may be of interest to
someone else.
2016-08-23 10:16:37 +02:00
Brian McKenna 7c3e0fccc3 hipchat: 4.0.1641 -> 4.26.0.1655 2016-08-23 14:19:12 +10:00
Tuomas Tynkkynen fffd8f192e treewide: Fix output references to xorg.libX11 2016-08-23 04:53:33 +03:00
Tuomas Tynkkynen cdfa83498e treewide: Fix output references to gtk2 2016-08-23 04:53:09 +03:00
Tuomas Tynkkynen 5ae4471fb5 treewide: Fix output references to gtk 2016-08-23 04:53:05 +03:00
Tuomas Tynkkynen df4ebf5f1a treewide: Fix output references to gnome3.gtk 2016-08-23 04:53:01 +03:00
Joachim F 72e7337dda Merge pull request #17871 from womfoo/bump/freenet-1475
freenet: 1470 -> 1475
2016-08-23 03:13:47 +02:00
Tuomas Tynkkynen f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Nikolay Amiantov a963b45c97 qutebrowser: fix restart 2016-08-22 20:07:30 +03:00
Márton Boros 71edc955b7 terraform: add meta 2016-08-22 16:22:29 +02:00
Márton Boros 1038c4f8e4 terraform: 0.7.0 -> 0.7.1 2016-08-22 16:09:15 +02:00
obadz ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Bjørn Forsman 5120af001f owncloud-client: 2.2.1 -> 2.2.3
Changelog: https://owncloud.org/changelog/desktop/
2016-08-21 21:55:38 +02:00
Ram Kromberg 64ba21e966 midori: vala -> vala_0_23 2016-08-21 20:02:08 +03:00
Kranium Gikos Mendoza 01fa27a84c freenet: 1470 -> 1475 2016-08-21 08:32:13 +08:00
Vladimír Čunát cdb44a4ada Merge branch 'master' into staging 2016-08-20 18:01:36 +02:00
Nikolay Amiantov 3c6beea1a7 gajim: use wrapPython 2016-08-20 00:43:45 +03:00
obadz 4574f22841 chromium: remove one layer of wrapper by using ed 2016-08-19 19:18:23 +01:00
obadz 80dbdba6dd weechat: add python & perl to PATH so that extensions can run 2016-08-19 13:48:35 +01:00
Eelco Dolstra 1efedc6c4c firefox-esr: 45.2.0 -> 45.3.0 2016-08-19 13:26:20 +02:00
Eelco Dolstra 360ee2f0b9 firefox: 48.0 -> 48.0.1 2016-08-19 13:25:43 +02:00
taku0 0cd039b40e firefox-bin: 48.0 -> 48.0.1 2016-08-19 03:12:15 +09:00
Gábor Lehel 5bef9b271c vivaldi: 1.2 -> 1.3 2016-08-18 15:13:39 +02:00
Franz Pletz b4cc9bd63a Merge remote-tracking branch 'origin/master' into hardened-stdenv
Fixes #17801 and #17802.
2016-08-17 19:43:43 +02:00
Nikolay Amiantov 1c5399626a qutebrowser: don't depend on qtmultimedia
It's not needed now that qtwebkit uses gstreamer backend
2016-08-17 20:30:50 +03:00
Nikolay Amiantov 1d53115765 qutebrowser: use qtwebkit-plugins 2016-08-17 20:20:35 +03:00