summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge pull request #8630 from lihop/nixos/fix-formattingDomen Kožar2016-02-27
|\
| * nixos/activation-script: fix formatting of exampleLeroy Hopson2016-02-27
| * xserver service: fix formatting of exampleLeroy Hopson2016-02-27
| * phpfpm service: fix formatting of exampleLeroy Hopson2016-02-27
| * fail2ban service: fix formatting of exampleLeroy Hopson2016-02-27
| * nsd service: fix formatting of exampleLeroy Hopson2016-02-27
| * cacert: fix formatting of exampleLeroy Hopson2016-02-27
| * nixos/freetds: fix formatting of exampleLeroy Hopson2016-02-27
| * nixos/vpnc: fix formatting of exampleLeroy Hopson2016-02-27
* | webkitgtk: fix build with glibc-2.23Vladimír Čunát2016-02-27
* | Merge #12796: nixos docs: show references to packagesVladimír Čunát2016-02-27
|\ \ | |/ |/|
| * nixos manuals: bring back package referencesVladimír Čunát2016-02-03
| * nixos docs: allow displaying package referencesVladimír Čunát2016-02-03
* | goPackages.oh: 2015-11-21 -> 2016-02-23Marius Bakke2016-02-27
* | goPackages.liner: git 2016-01-24Marius Bakke2016-02-27
* | libreoffice: Taking a fix from BLFS for using Glibc 2.23 (isnan is not std::i...Michael Raskin2016-02-27
* | ecl: fix source URLMichael Raskin2016-02-27
* | Merge pull request #13499 from eskimor/libinput-mkEnableOptionArseniy Seroka2016-02-27
|\ \
| * | nixos: libinput use mkEnableOptionRobert Klotzner2016-02-27
|/ /
* | Merge branch 'ibus'Thomas Tuegel2016-02-26
|\ \
| * | ibus: add engine list to module descriptionThomas Tuegel2016-02-26
| * | ibus: refresh cache at startupThomas Tuegel2016-02-26
|/ /
* | Merge branch 'ibus'Thomas Tuegel2016-02-26
|\ \
| * | ibus: rewrite NixOS moduleThomas Tuegel2016-02-26
| * | ibus-anthy: upgrade to Python 3Thomas Tuegel2016-02-26
| * | ibus-hangul: download release from GitHubThomas Tuegel2016-02-26
| * | ibus-table: 1.9.6 -> 1.9.11Thomas Tuegel2016-02-26
| * | ibus-with-plugins: rewrite wrapperThomas Tuegel2016-02-26
| * | ibus: 1.5.11 -> 1.5.13Thomas Tuegel2016-02-26
* | | Merge pull request #11141 from cresh/darwin-msmtpzimbatm2016-02-27
|\ \ \
| * | | msmtp: Enable on OS X with Keychain integration.Marcus Crestani2015-11-19
* | | | Merge pull request #11142 from cresh/darwin-sshpasszimbatm2016-02-27
|\ \ \ \
| * | | | sshpass: Enable on OS X.Marcus Crestani2015-11-19
| |/ / /
* | | | Merge pull request #13471 from Profpatsch/networkmanager-link-localArseniy Seroka2016-02-27
|\ \ \ \ | |_|/ / |/| | |
| * | | networkmanager: fix link-local ip addressesProfpatsch2016-02-26
* | | | Make explicit that maintainers should use a real nameEelco Dolstra2016-02-27
* | | | Merge pull request #11314 from anderspapitto/flamegraphzimbatm2016-02-26
|\ \ \ \
| * | | | FlameGraph: init at 182b24fbAnders Papitto2015-12-12
* | | | | Merge pull request #11274 from robgssp/ldapzimbatm2016-02-26
|\ \ \ \ \
| * | | | | ldap-client: don't break on test failuresRobert Glossop2015-11-25
* | | | | | Merge pull request #11210 from mitchty/munge-on-osxzimbatm2016-02-26
|\ \ \ \ \ \
| * | | | | | Munge is buildable/usable on osx.Mitch Tishmack2015-11-22
* | | | | | | Merge remote-tracking branch 'upstream/staging'zimbatm2016-02-26
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #13445 from abbradar/ssl-cert-checkEelco Dolstra2016-02-25
| |\ \ \ \ \ \ \
| | * | | | | | | stdenv: set SSL_CERT_FILE only if it isn't alreadyNikolay Amiantov2016-02-25
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into stagingVladimír Čunát2016-02-25
| |\ \ \ \ \ \ \
| * | | | | | | | util-linux: create -Minimal and utillinux (full)Kevin Cox2016-02-25
| * | | | | | | | Merge branch 'glibc-2.22' into stagingVladimír Čunát2016-02-25
| |\ \ \ \ \ \ \ \
| | * | | | | | | | glibc: 2.22 -> 2.23Vladimír Čunát2016-02-21
| | * | | | | | | | glibc: Drop hurd supportEelco Dolstra2016-02-18