summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into closure-sizeVladimír Čunát2016-02-14
|\
| * Merge pull request #9913 from chris-martin/synaptics-optionsFranz Pletz2016-02-14
| |\ | | | | | | Add synaptics options for palm detection and scroll speed
| | * synaptics: add scrollDelta optionChris Martin2015-09-29
| | |
| | * synaptics: add palmDetect tuning optionsChris Martin2015-09-29
| | |
| * | Merge pull request #12986 from Ericson2314/patch-1Franz Pletz2016-02-14
| |\ \ | | | | | | | | doc: Fix URL to ghc-paths patch
| | * | doc: Fix URL to ghc-paths patchJohn Ericson2016-02-13
| |/ /
| * | Merge pull request #12977 from jasedit/update_zeromq_4.1.4Domen Kožar2016-02-13
| |\ \ | | | | | | | | Updating ZeroMQ to 4.1.4
| | * | Updating ZeroMQ to 4.1.4Jason Ziglar2016-02-13
| | | |
| * | | Merge pull request #12975 from tlevine/gnucashPeter Simons2016-02-13
| |\ \ \ | | | | | | | | | | gnucash: enable dbi
| | * | | gnucash: enable dbiThomas Levine2016-02-13
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My accounts are stored in the DBI backend (SQLite, specifically). Before the present change, GnuCash would be compiled without DBI support (`--disable-dbi` flag), so I could only use the XML backend. Now I can use either backend. I made the change only for 2.6. It looks like 2.4 works the same way, so maybe I'll enable DBI for that one later. Making nix packages is delightful! It might replace my accounting hobby!
| * | | Merge pull request #12976 from FRidh/mendeleyFrederik Rietdijk2016-02-13
| |\ \ \ | | |/ / | |/| | mendeley: 1.15.2 -> 1.15.3
| | * | mendeley: 1.15.2 -> 1.15.3Frederik Rietdijk2016-02-13
| | | |
| * | | Merge pull request #12907 from tg-x/irssi-otrFranz Pletz2016-02-13
| |\ \ \ | | | | | | | | | | irssi-otr: 640e98c74b -> 1.0.1
| | * | | irssi-otr: 1.0.0 -> 1.0.1tg(x)2016-02-13
| | | | |
| | * | | irssi-otr: fetchFromGithubtg(x)2016-02-12
| | | | |
| | * | | irssi-otr: 640e98c74b -> 1.0.0tg(x)2016-02-10
| | | | |
| * | | | Merge pull request #12959 from nico202/timemachineFranz Pletz2016-02-13
| |\ \ \ \ | | | | | | | | | | | | timemachine: init at 0.3.1
| | * | | | timemachine: init at 0.3.1=2016-02-12
| | | | | |
| * | | | | Merge pull request #12597 from zimbatm/nix-prefetch-git-nameDaniel Peebles2016-02-13
| |\ \ \ \ \ | | | | | | | | | | | | | | nix-prefetch-git: use fetchgit's naming heuristic
| | * | | | | nix-prefetch-git: use fetchgit's naming heuristiczimbatm2016-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes #6651. Before this change the `nix-prefetch-git` script would use a different store name than nix's `fetchgit` function. Because of that it was not possible to use `nix-prefetch-git` as a way to pre-populate the store (for example when the user it using private git dependencies that needs access to the ssh agent)
| * | | | | | Merge pull request #12967 from rnhmjoj/imvFranz Pletz2016-02-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | imv: 1.2.0 -> 2.0.0
| | * | | | | | imv: 1.2.0 -> 2.0.0rnhmjoj2016-02-13
| | | | | | | |
| * | | | | | | Merge pull request #12958 from nico202/non-updateFranz Pletz2016-02-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | non: 2015-12-16 -> 2016-02-07
| | * | | | | | | non: 2015-12-16 -> 2016-02-07=2016-02-12
| | | | | | | | |
| * | | | | | | | kibana: 4.1.2 -> 4.4.1Robin Gloster2016-02-13
| | | | | | | | |
| * | | | | | | | elasticsearch2: init at 2.2.0Markus Wotringer2016-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes by @globin: * updated 2.1.0 to 2.2.0 * moved to a new derivation closes #11446 Signed-off-by: Robin Gloster <mail@glob.in>
| * | | | | | | | kibana: fix pkg and moduleRobin Gloster2016-02-13
| | | | | | | | |
| * | | | | | | | logstash module: use literalExampleRobin Gloster2016-02-13
| | | | | | | | |
| * | | | | | | | nixos: i2pd, make config options adhere to version 2.4.0Edward Tjörnhammar2016-02-13
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #12935 from romildo/fix-opensmtpRickard Nilsson2016-02-13
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | opensmtpd: compile with support for 'db' tables
| | * | | | | | opensmtpd: compile with support for 'db' tablesJosé Romildo Malaquias2016-02-11
| | | | | | | |
| * | | | | | | plot.ly: upgrade to 1.9.5Rob Vermaas2016-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 104fde593d26c4497fec227aabf5d9bb84ef44de)
| * | | | | | | calibre: 2.50.1 -> 2.51.0Pascal Wittmann2016-02-12
| | | | | | | |
| * | | | | | | haskell-pandoc: drop obsolete overridePeter Simons2016-02-12
| | | | | | | |
| * | | | | | | haskell-hans: drop obsolete patchPeter Simons2016-02-12
| | | | | | | |
| * | | | | | | xmonad-contrib: drop obsolete overridesPeter Simons2016-02-12
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #12942 from jgillich/gollumArseniy Seroka2016-02-12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | gollum: init at 4.0.1
| | * | | | | | gollum: init at 4.0.1Jakob Gillich2016-02-11
| | | | | | | |
| * | | | | | | Merge pull request #12944 from zimbatm/jruby-9.0.5.0Arseniy Seroka2016-02-12
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | jruby: 1.7.21 -> 9.0.5.0
| | * | | | | | jruby: 1.7.21 -> 9.0.5.0zimbatm2016-02-11
| | | | | | | |
| * | | | | | | nss: 3.21 -> 3.22Eelco Dolstra2016-02-12
| | | | | | | |
| * | | | | | | nix: Fix indentationEelco Dolstra2016-02-12
| | | | | | | |
| * | | | | | | dspam: fix maintenance scriptNikolay Amiantov2016-02-12
| | | | | | | |
| * | | | | | | dspam service: make maintenance script verboseNikolay Amiantov2016-02-12
| | | | | | | |
| * | | | | | | nix: 1.11.1 -> 1.11.2Eelco Dolstra2016-02-12
| | | | | | | |
| * | | | | | | all-packages.nix: drop postgresql90 attributePeter Simons2016-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL 9.0 was removed in 0140591eabc8bf7c50adc673da0348313e6d1a2b.
| * | | | | | | Merge pull request #12939 from jgillich/synergyArseniy Seroka2016-02-12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | synergy: 1.7.4 -> 1.7.5
| | * | | | | | | synergy: 1.7.4 -> 1.7.5Jakob Gillich2016-02-11
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | repository has moved
| * | | | | | | systemd: 228 -> 229Eelco Dolstra2016-02-12
| | | | | | | |
| * | | | | | | nixos/tests/simple.nix: Include minimal.nixEelco Dolstra2016-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the amount of rebuilds (particularly some X11 stuff) after changing some dependencies like systemd.