summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-04-18
|\
| * Remove "which" from base.nixEelco Dolstra2016-04-18
| * Revert "Revert "Remove which -> type -P alias.""Eelco Dolstra2016-04-18
| * acme.nix: Fix unit descriptionsEelco Dolstra2016-04-18
| * Merge #14800: get_iplayer: fix outputs and add man pageVladimír Čunát2016-04-18
| |\
| | * get_iplayer: fix outputs and add man pageRodney Lorrimar2016-04-18
| * | Revert "nixos.tests.printing: fix"Joachim Fasting2016-04-18
| |/
| * Merge commit 'refs/pull/14779/head' of git://github.com/NixOS/nixpkgsNikolay Amiantov2016-04-18
| |\
| | * warzone2100: 3.1.1 -> 3.1.5Ricardo Ardissone2016-04-18
| * | Adding back Rigs of Rods.Lluís Batlle i Rossell2016-04-18
| |\ \
| | * | Make rigsofrods use mygui with ogre. Required.Lluís Batlle i Rossell2016-04-18
| | * | Fixing ogre-paged build.Lluís Batlle i Rossell2016-04-18
| | * | Removing content-pack download from rigsofrods.Lluís Batlle i Rossell2016-04-18
| | * | Make rigsofrods build the latest code.Lluís Batlle i Rossell2016-04-18
| | * | Revert "rigsofrods: remove dead package"Lluís Batlle i Rossell2016-04-18
| | * | softhsm: init -> 2.1.0Michiel Leenaars2016-04-18
| | * | root: 5.34.15 -> 6.04.16Dmitry Kalinkin2016-04-18
| | * | gem-config: fix bundlerMichael Fellinger2016-04-18
| | * | bootstrap-tools-linux: Use tar without aclAlexander Ried2016-04-18
| | * | bootstrap-tools-linux: Qualify all multi-output packagesAlexander Ried2016-04-18
| | * | bundlerEnv: filter gemset groupsMichael Fellinger2016-04-18
| * | | softhsm: init -> 2.1.0Michiel Leenaars2016-04-18
| * | | Merge pull request #14794 from veprbl/root6.04.16Peter Simons2016-04-18
| |\ \ \
| | * | | root: 5.34.15 -> 6.04.16Dmitry Kalinkin2016-04-17
| * | | | Merge pull request #14787 from manveru/gem-configzimbatm2016-04-18
| |\ \ \ \
| | * | | | gem-config: fix bundlerMichael Fellinger2016-04-18
| |/ / / /
| * | | | Merge #14792: bootstrap-tools-linux: fixVladimír Čunát2016-04-18
| |\ \ \ \
| | * | | | bootstrap-tools-linux: Use tar without aclAlexander Ried2016-04-18
| | * | | | bootstrap-tools-linux: Qualify all multi-output packagesAlexander Ried2016-04-18
| * | | | | Merge pull request #14786 from manveru/gemset-groupsCharles Strahan2016-04-18
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | bundlerEnv: filter gemset groupsMichael Fellinger2016-04-17
| | |/ / /
| * | | | Merge pull request #14780 from womfoo/update-facterTuomas Tynkkynen2016-04-18
| |\ \ \ \
| | * | | | leatherman: init at 0.4.2Kranium Gikos Mendoza2016-04-18
| | * | | | facter: 3.1.3 -> 3.1.5Kranium Gikos Mendoza2016-04-18
| * | | | | Merge pull request #14793 from micxjo/update-fehTuomas Tynkkynen2016-04-18
| |\ \ \ \ \
| | * | | | | feh: 2.14 -> 2.15.2Micxjo Funkcio2016-04-17
| |/ / / / /
| * | | | | nixos.tests.printing: fixJoachim Fasting2016-04-18
| * | | | | apparmor: cleanupsJoachim Fasting2016-04-18
| * | | | | Merge pull request #14781 from ambrop72/wine-fixNikolay Amiantov2016-04-18
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | wine: Disable stripping to avoid breaking fakedlls.Ambroz Bizjak2016-04-17
| * | | | | Merge pull request #14788 from manveru/capybara-webkitArseniy Seroka2016-04-18
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | capybara-webkit: qt5Full -> qt48Michael Fellinger2016-04-17
| |/ / / /
| * | | | goPackages.hologram: update to latestDan Peebles2016-04-17
| * | | | Merge pull request #14772 from cleverca22/mariadbArseniy Seroka2016-04-17
| |\ \ \ \
| | * | | | mariadb: fix arm buildsmichael bishop2016-04-17
| * | | | | cups: do not split doc outputLuca Bruno2016-04-17
| * | | | | golden-cheetah: remove from pkgs, it does not evaluate without config.golden-...Luca Bruno2016-04-17
| * | | | | mariadb: fix build on darwinDan Peebles2016-04-17
| * | | | | libpsl: list 2016-04-05 -> 2016-04-16Tobias Geerinckx-Rice2016-04-17
| * | | | | zpaq: 710 -> 711Tobias Geerinckx-Rice2016-04-17
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-02 20:14:03 +0000