summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge pull request #2979 from bluescreen303/idrisPeter Simons2014-06-18
|\
| * emacs-idris-mode: upgrade to 0.9.13.1Mathijs Kwik2014-06-16
| * idris: provide boehmgc to compile with llvm backendMathijs Kwik2014-06-16
* | Create an option to build 3.16-rc1 which carries a new Wireless driver; make ...Michael Raskin2014-06-18
* | duo-unix: upgrade, fix full name + versionAustin Seipp2014-06-17
* | arcanist: 20140606 -> 20140617Austin Seipp2014-06-17
* | Don't suggest using --arg config '{ allowUnfree = true; }'Eelco Dolstra2014-06-17
* | nixos manual: fix typo (close #2997)Anders Claesson2014-06-17
* | jd-gui: version 0.3.5Austin Seipp2014-06-17
* | nixos-iso: Re-enable new kernel iso images (close #2839)William A. Kennington III2014-06-17
* | sublime3: fix plugin_host (close #2804)Wout Mertens2014-06-17
* | nixos.tests.installer: Fix test failures due to network being disabledRicardo M. Correia2014-06-17
* | Merge pull request #2991 from bluescreen303/kernel-3.15Shea Levy2014-06-17
|\ \
| * | linux-3.15: upgrade to 3.15.1Mathijs Kwik2014-06-17
* | | Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgsShea Levy2014-06-17
|\ \ \
| * | | Revert "s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs."vi2014-06-03
| * | | Mark s3cmd-1.5-pre-81e3842f7a as low priority.vi2014-06-02
| * | | s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs.vi2014-06-02
| * | | s3cmd-1.5-pre-81e3842f7a: Use more precise naming convention.vi2014-06-02
| * | | Supplementary derivation for s3cmd, building from git HEAD.vi2014-06-02
* | | | Merge pull request #2976 from bluescreen303/nginxlethalman2014-06-17
|\ \ \ \ | |_|/ / |/| | |
| * | | nixos/nginx: fix group and stateDir permissionsMathijs Kwik2014-06-16
| * | | nginx: add echo module, fix aio on linux&freebsdMathijs Kwik2014-06-16
| | |/ | |/|
* | | Merge pull request #2972 from proger/rsync-patch-hashJohn Wiegley2014-06-16
|\ \ \
| * | | rsync: sha256 for the patch was updatedVladimir Kirillov2014-06-16
| |/ /
* | | Agda: add 2.4.0.1, 2.3.2.2 is still the default for nowJohn Wiegley2014-06-16
* | | haskell-boxes: new expressionJohn Wiegley2014-06-16
* | | haskell-free-operational: new expressionJohn Wiegley2014-06-16
* | | haskell-equivalence: new expressionJohn Wiegley2014-06-16
* | | haskell-STMonadTrans: new expressionJohn Wiegley2014-06-16
* | | mpd: clean up some flagsMateusz Kowalczyk2014-06-16
* | | libid3tag: apply fixes before buildMateusz Kowalczyk2014-06-16
|/ /
* | Merge pull request #2970 from tailhook/nanomsg_and_zeromqAustin Seipp2014-06-16
|\ \
| * | Upgrade zeromq and nanomsgPaul Colomiets2014-06-16
|/ /
* | Fix generation of synergy-{client,server} when disabledEelco Dolstra2014-06-16
* | nixUnstable: bumpShea Levy2014-06-16
* | hscolour-bootstrap: GHC 6.10.x and earlier don't support the -rtsopts optionPeter Simons2014-06-16
* | haskell-git-annex: update to version 5.20140613Peter Simons2014-06-16
* | hscolour-bootstrap: allow setting RTS options for the hscolour binary we use ...Peter Simons2014-06-16
* | Merge pull request #2967 from sol/masterPeter Simons2014-06-16
|\ \
| * | Update haskell-aeson-qq to version 0.7.2Simon Hengel2014-06-16
| * | Update haskell-http-kit to version 0.5.0Simon Hengel2014-06-16
* | | Merge #2798: stdenv and a few other big updatesVladimír Čunát2014-06-16
|\ \ \
| * \ \ Merge recent masterVladimír Čunát2014-06-15
| |\ \ \
| * \ \ \ Merge recent masterVladimír Čunát2014-06-12
| |\ \ \ \
| * | | | | mesa: fix libGL searching for libudevVladimír Čunát2014-06-11
| * | | | | dbus: security-only update, CVE-2014-3477 (DOS)Vladimír Čunát2014-06-11
| * | | | | mesa: maintenance update 10.1.4 -> .5Vladimír Čunát2014-06-11
| * | | | | libtasn1: 3.4 -> 3.6. Fixes some security CVEs.Luca Bruno2014-06-11
| * | | | | Merge recent masterVladimír Čunát2014-06-10
| |\ \ \ \ \