Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #6452 from rushmorem/update-chronos-port | Jaka Hudoklin | 2015-02-19 |
|\ | | | | | Update chronos default port | ||
| * | Update chronos default port | rushmorem | 2015-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 framework | rushmorem | 2015-02-19 |
|/ | |||
* | Merge remote-tracking branch 'origin/staging' | Shea Levy | 2015-02-17 |
|\ | | | | | | | Darwin and haskell fixes. | ||
| * | Merge remote-tracking branch 'master' into staging. | Peter Simons | 2015-02-13 |
| |\ | |||
| * \ | Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging | Shea Levy | 2015-02-11 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Took "ours" for the conflict and changed libiconvOrEmpty to libiconv Conflicts: pkgs/applications/audio/ncmpcpp/default.nix | ||
| | * | | kill libiconvOr* | Eric Seidel | 2015-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 correction | Edward Tjörnhammar | 2015-02-17 |
| | | | | |||
* | | | | qbittorrent: add gui & webui optionals | codyopel | 2015-02-15 |
| |_|/ |/| | | |||
* | | | vimb: Update from 2.8 to 2.9 | Rickard Nilsson | 2015-02-13 |
| | | | |||
* | | | notbit: Update git | William A. Kennington III | 2015-02-11 |
| | | | |||
* | | | Merge pull request #6288 from ehmry/ratox | cillianderoiste | 2015-02-10 |
|\ \ \ | | | | | | | | | ratox: bump to 0.2.1 | ||
| * | | | ratox: bump to 0.2.1 | Emery Hemingway | 2015-02-10 |
| |/ / | |||
* | | | Merge pull request #6229 from devhell/canto | lethalman | 2015-02-10 |
|\ \ \ | | | | | | | | | canto-{curses,daemon}: Add packages | ||
| * | | | canto-{curses,daemon}: Add packages | devhell | 2015-02-08 |
| | | | | | | | | | | | | | | | | | | | | This adds canto-daemon, a feedparser background service, and canto-curses, a highly customizable curses-based frontend. | ||
* | | | | syncthing: Update to 0.10.22 | Brendan Long | 2015-02-09 |
| |/ / |/| | | |||
* | | | bro: update from 2.3.1 to 2.3.2 | Pascal Wittmann | 2015-02-09 |
| | | | |||
* | | | tkabber: update version | Nikolay Amiantov | 2015-02-09 |
| | | | |||
* | | | Merge pull request #6245 from edwtjo/samba-collate-urls | William A. Kennington III | 2015-02-08 |
|\ \ \ | |_|/ |/| | | fetchurl: collate samba project urls into a mirror | ||
| * | | fetchurl: collate samba project urls into a mirror | Edward Tjörnhammar | 2015-02-08 |
| | | | |||
* | | | Merge pull request #6119 from lethalman/go | lethalman | 2015-02-07 |
|\ \ \ | | | | | | | | | Go packages, buildGoPackage | ||
| * | | | Add dontInstallSrc flag to buildGoPackage | Luca Bruno | 2015-02-05 |
| | | | | |||
| * | | | Use buildFlags in buildGoPackage instead of makeFlags | Luca Bruno | 2015-02-05 |
| | | | | |||
| * | | | Port syncthing to buildGoPackage | Luca Bruno | 2015-02-05 |
| | | | | |||
| * | | | Port pond to buildGoPackage | Luca Bruno | 2015-02-04 |
| | | | | |||
* | | | | Merge pull request #5622 from offlinehacker/panamax | Jaka Hudoklin | 2015-02-07 |
|\ \ \ \ | | | | | | | | | | | panamax: new package and service | ||
| * | | | | panamax: rewrite using 'pleasent ruby' | Matej Cotman | 2015-02-07 |
| | | | | | |||
| * | | | | panamax: simplify, refactor, add test | Jaka Hudoklin | 2015-02-07 |
| | | | | | |||
| * | | | | panamax: new package and service | Matej Cotman | 2015-02-07 |
| | |/ / | |/| | | |||
* | | | | Merge pull request #6210 from ehmry/ratox | viric | 2015-02-07 |
|\ \ \ \ | |/ / / |/| | | | ratox: initial package at v0.2 | ||
| * | | | ratox: initial package | Emery Hemingway | 2015-02-07 |
| | |/ | |/| | | | | | | | http://ratox.2f30.org/ | ||
* | | | flashplayer: Minor security update to 11.2.202.442 | Nathaniel Baxter | 2015-02-07 |
| | | | |||
* | | | umurmur: Add meta platforms | William A. Kennington III | 2015-02-06 |
| | | | |||
* | | | umurmur: 0.2.13 -> 0.2.15 | William A. Kennington III | 2015-02-06 |
| | | | |||
* | | | unison: update from 2.40.102 to 2.48.3 | Pascal Wittmann | 2015-02-06 |
| | | | |||
* | | | Fix luakit description | Luca Bruno | 2015-02-06 |
| | | | |||
* | | | Merge pull request #5805 from matthiasbeyer/add-luakit | lethalman | 2015-02-06 |
|\ \ \ | | | | | | | | | [WIP] Add package: luakit | ||
| * | | | Add package: luakit | Matthias Beyer | 2015-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 tests | Domen Kožar | 2015-02-06 |
| | | | | | | | | | | | | | | | (cherry picked from commit 84bd62da0a63e18fa285bacf0e648b82d601816e) Signed-off-by: Domen Kožar <domen@dev.si> | ||
* | | | weechat: update to 1.1.1 | Rok Garbas | 2015-02-05 |
| | | | |||
* | | | Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' | Shea Levy | 2015-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 Simons | 2015-01-19 |
| |\ \ \ | |||
| * | | | | rename occurrences of gcc.gcc to gcc.cc | Eric Seidel | 2015-01-14 |
| | | | | | |||
| * | | | | rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc | Eric Seidel | 2015-01-14 |
| | | | | | |||
* | | | | | fix 404 URLs (close #6105) | Kosyrev Serge | 2015-02-02 |
| | | | | | |||
* | | | | | owncloud: update to 1.7.1 | Andrey Arapov | 2015-02-02 |
| | | | | | |||
* | | | | | pidgin-otr: adopt and add platforms | Nikolay Amiantov | 2015-02-02 |
| |_|_|/ |/| | | | |||
* | | | | flashplayer: minor update (sha256 correction) | Andrey Arapov | 2015-01-31 |
| | | | | |||
* | | | | libtoxcore, utox, qtox, toxic: Update to the newest Dev version | Andrey Arapov | 2015-01-31 |
| |_|/ |/| | | |||
* | | | Merge pull request #6011 from taku0/firefox-bin-35.0.1 | Pascal Wittmann | 2015-01-28 |
|\ \ \ | | | | | | | | | Update firefox-bin to 35.0.1 |