summary refs log tree commit diff
path: root/pkgs/applications/networking
Commit message (Collapse)AuthorAge
* Merge pull request #6452 from rushmorem/update-chronos-portJaka Hudoklin2015-02-19
|\ | | | | Update chronos default port
| * Update chronos default portrushmorem2015-02-19
| | | | | | | | | | | | | | Update chronos default port to match the one documented on their website (http://airbnb.github.io/chronos). The one in their repo (the current one) clashes with the marathon documented one.
* | Add marathon mesos frameworkrushmorem2015-02-19
|/
* Merge remote-tracking branch 'origin/staging'Shea Levy2015-02-17
|\ | | | | | | Darwin and haskell fixes.
| * Merge remote-tracking branch 'master' into staging.Peter Simons2015-02-13
| |\
| * \ Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into stagingShea Levy2015-02-11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Took "ours" for the conflict and changed libiconvOrEmpty to libiconv Conflicts: pkgs/applications/audio/ncmpcpp/default.nix
| | * | kill libiconvOr*Eric Seidel2015-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
* | | | unison: sha correctionEdward Tjörnhammar2015-02-17
| | | |
* | | | qbittorrent: add gui & webui optionalscodyopel2015-02-15
| |_|/ |/| |
* | | vimb: Update from 2.8 to 2.9Rickard Nilsson2015-02-13
| | |
* | | notbit: Update gitWilliam A. Kennington III2015-02-11
| | |
* | | Merge pull request #6288 from ehmry/ratoxcillianderoiste2015-02-10
|\ \ \ | | | | | | | | ratox: bump to 0.2.1
| * | | ratox: bump to 0.2.1Emery Hemingway2015-02-10
| |/ /
* | | Merge pull request #6229 from devhell/cantolethalman2015-02-10
|\ \ \ | | | | | | | | canto-{curses,daemon}: Add packages
| * | | canto-{curses,daemon}: Add packagesdevhell2015-02-08
| | | | | | | | | | | | | | | | | | | | This adds canto-daemon, a feedparser background service, and canto-curses, a highly customizable curses-based frontend.
* | | | syncthing: Update to 0.10.22Brendan Long2015-02-09
| |/ / |/| |
* | | bro: update from 2.3.1 to 2.3.2Pascal Wittmann2015-02-09
| | |
* | | tkabber: update versionNikolay Amiantov2015-02-09
| | |
* | | Merge pull request #6245 from edwtjo/samba-collate-urlsWilliam A. Kennington III2015-02-08
|\ \ \ | |_|/ |/| | fetchurl: collate samba project urls into a mirror
| * | fetchurl: collate samba project urls into a mirrorEdward Tjörnhammar2015-02-08
| | |
* | | Merge pull request #6119 from lethalman/golethalman2015-02-07
|\ \ \ | | | | | | | | Go packages, buildGoPackage
| * | | Add dontInstallSrc flag to buildGoPackageLuca Bruno2015-02-05
| | | |
| * | | Use buildFlags in buildGoPackage instead of makeFlagsLuca Bruno2015-02-05
| | | |
| * | | Port syncthing to buildGoPackageLuca Bruno2015-02-05
| | | |
| * | | Port pond to buildGoPackageLuca Bruno2015-02-04
| | | |
* | | | Merge pull request #5622 from offlinehacker/panamaxJaka Hudoklin2015-02-07
|\ \ \ \ | | | | | | | | | | panamax: new package and service
| * | | | panamax: rewrite using 'pleasent ruby'Matej Cotman2015-02-07
| | | | |
| * | | | panamax: simplify, refactor, add testJaka Hudoklin2015-02-07
| | | | |
| * | | | panamax: new package and serviceMatej Cotman2015-02-07
| | |/ / | |/| |
* | | | Merge pull request #6210 from ehmry/ratoxviric2015-02-07
|\ \ \ \ | |/ / / |/| | | ratox: initial package at v0.2
| * | | ratox: initial packageEmery Hemingway2015-02-07
| | |/ | |/| | | | | | | http://ratox.2f30.org/
* | | flashplayer: Minor security update to 11.2.202.442Nathaniel Baxter2015-02-07
| | |
* | | umurmur: Add meta platformsWilliam A. Kennington III2015-02-06
| | |
* | | umurmur: 0.2.13 -> 0.2.15William A. Kennington III2015-02-06
| | |
* | | unison: update from 2.40.102 to 2.48.3Pascal Wittmann2015-02-06
| | |
* | | Fix luakit descriptionLuca Bruno2015-02-06
| | |
* | | Merge pull request #5805 from matthiasbeyer/add-luakitlethalman2015-02-06
|\ \ \ | | | | | | | | [WIP] Add package: luakit
| * | | Add package: luakitMatthias Beyer2015-02-06
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This patch adds the luakit browser. It has to be build using lua5.1, I tried 5.2 but I couldn't run luakit due to a runtime error with it. It also uses gtk3 here, override to use gtk2, which should also work. Suggested-by: Benno Fünfstück <benno.fuenfstueck@gmail.com>
* | | chromium: remove preferLocalBuild due to intense IO in VM testsDomen Kožar2015-02-06
| | | | | | | | | | | | | | | (cherry picked from commit 84bd62da0a63e18fa285bacf0e648b82d601816e) Signed-off-by: Domen Kožar <domen@dev.si>
* | | weechat: update to 1.1.1Rok Garbas2015-02-05
| | |
* | | Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'Shea Levy2015-02-02
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
| * \ \ Merge branch 'master' into staging.Peter Simons2015-01-19
| |\ \ \
| * | | | rename occurrences of gcc.gcc to gcc.ccEric Seidel2015-01-14
| | | | |
| * | | | rename all occurrences of stdenv.cc.gcc to stdenv.cc.ccEric Seidel2015-01-14
| | | | |
* | | | | fix 404 URLs (close #6105)Kosyrev Serge2015-02-02
| | | | |
* | | | | owncloud: update to 1.7.1Andrey Arapov2015-02-02
| | | | |
* | | | | pidgin-otr: adopt and add platformsNikolay Amiantov2015-02-02
| |_|_|/ |/| | |
* | | | flashplayer: minor update (sha256 correction)Andrey Arapov2015-01-31
| | | |
* | | | libtoxcore, utox, qtox, toxic: Update to the newest Dev versionAndrey Arapov2015-01-31
| |_|/ |/| |
* | | Merge pull request #6011 from taku0/firefox-bin-35.0.1Pascal Wittmann2015-01-28
|\ \ \ | | | | | | | | Update firefox-bin to 35.0.1