about summary refs log tree commit diff
Commit message (Expand)AuthorAge
* libreswan: add package and service to nixosAlex Franchuk2016-03-02
* revert fetch-cargo-deps changeJude Taylor2016-02-23
* ibus-table-others: import ibus-table properlyThomas Tuegel2016-02-23
* ibus-table-others: use mktemp for temporary directoryThomas Tuegel2016-02-23
* Merge pull request #13409 from mayflower/doc/meta-licenses-strzimbatm2016-02-24
|\
| * nixpkgs manual: Fix license strings docsFranz Pletz2016-02-24
* | fix library dependencies for cargo on darwinJude Taylor2016-02-23
* | clean up usage of procps in rustcJude Taylor2016-02-23
* | fix fetch-cargo SSL errorJude Taylor2016-02-23
* | Merge pull request #12532 from bendlas/update-splixzimbatm2016-02-24
|\ \
| * | splix: 2.0.0 -> svn-r315Herwig Hochleitner2016-02-16
* | | Merge pull request #12540 from eskimor/libinput-masterzimbatm2016-02-24
|\ \ \
| * | | libinput: configuration support: PolishingRobert Klotzner2016-01-22
| * | | nixos: libinput added optionsRobert Klotzner2016-01-22
| * | | nixos: Added libinput configurationRobert Klotzner2016-01-22
* | | | Merge pull request #12875 from artuuge/epson-escprzimbatm2016-02-23
|\ \ \ \
| * | | | epson-escpr: init at version 1.6.3artuuge2016-02-08
* | | | | Merge pull request #12866 from nathan7/rubygem-drvname-fixzimbatm2016-02-23
|\ \ \ \ \
| * | | | | buildRubyGem: pass the gem version through into the derivation nameNathan Zadoks2016-02-07
| * | | | | buildRubyGem: ensure gem versions don't get misparsedNathan Zadoks2016-02-07
* | | | | | Merge pull request #13019 from tg-x/qtoxzimbatm2016-02-23
|\ \ \ \ \ \
| * | | | | | filter_audio: remove duplicate package, filter-audio already exists and in usetg(x)2016-02-17
| * | | | | | utox: 7e290747 -> 0.5.0tg(x)2016-02-17
| * | | | | | qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131tg(x)2016-02-15
* | | | | | | Merge pull request #13114 from colemickens/azurezimbatm2016-02-23
|\ \ \ \ \ \ \
| * | | | | | | azure: package qemu @ 2.2.0Cole Mickens2016-02-18
* | | | | | | | Merge pull request #13115 from colemickens/azure-agentzimbatm2016-02-23
|\ \ \ \ \ \ \ \
| * | | | | | | | azure-agent: switch back to upstream WALinuxAgentCole Mickens2016-02-18
| |/ / / / / / /
* | | | | | | | Merge pull request #13094 from nathan7/chromium-flash-version-jqzimbatm2016-02-23
|\ \ \ \ \ \ \ \
| * | | | | | | | chromium/plugins: use jshon for extracting the Flash version from JSONNathan Zadoks2016-02-19
* | | | | | | | | Merge pull request #13111 from tsion/simplify-assertzimbatm2016-02-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Require at least one of url or urls in fetchurl.Scott Olson2016-02-19
| * | | | | | | | | Simplify fetchurl assertion logic.Scott Olson2016-02-18
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12786 from phunehehe/unused-bundler-headzimbatm2016-02-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unused file bundler-head.nix (bundler_HEAD is now just an alias for bu...Hoang Xuan Phu2016-02-03
* | | | | | | | | | Merge pull request #13125 from abbradar/uwsgizimbatm2016-02-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | uwsgi service: update documentationNikolay Amiantov2016-02-19
| * | | | | | | | | | uwsgi service: refactor, throw more errors and drop simultaneous Python 2/3 i...Nikolay Amiantov2016-02-19
| * | | | | | | | | | uwsgi: disable built-in yaml supportNikolay Amiantov2016-02-19
| * | | | | | | | | | uwsgi: refactor, throw sensible error if plugin is not foundNikolay Amiantov2016-02-19
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #13356 from zimbatm/cidezimbatm2016-02-23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | cide: init at 0.8.1zimbatm2016-02-21
* | | | | | | | | | wpsoffice: unfree-redistributable not in lib.licensesFranz Pletz2016-02-23
* | | | | | | | | | Merge pull request #10980 from bcdarwin/minc-toolsArseniy Seroka2016-02-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | minc-tools: init at 2.3.00Ben Darwin2016-02-23
| * | | | | | | | | | libminc: init at 2.3.00Ben Darwin2016-02-23
* | | | | | | | | | | Merge pull request #13392 from spacefrogg/dialogArseniy Seroka2016-02-23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dialog: 1.2-20150920 -> 1.3-20160209Michael Raitza2016-02-23
* | | | | | | | | | | | Merge pull request #13391 from spacefrogg/gencfsmFranz Pletz2016-02-23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gnome-encfs-manager: 1.8.15 -> 1.8.16Michael Raitza2016-02-23
| |/ / / / / / / / / / /