summary refs log tree commit diff
path: root/pkgs/misc
Commit message (Expand)AuthorAge
* cups: fix on DarwinDan Peebles2017-04-06
* cups-toshiba-estudio: init at 7.51 (#24676)Jean Potier2017-04-06
* Merge branch 'master' into stagingDan Peebles2017-03-30
|\
| * wxmupen64plus: fix evalRobin Gloster2017-03-30
| * wxmupen64plus: mark as brokenRobin Gloster2017-03-30
| * freestyle: mark as brokenRobin Gloster2017-03-30
| * Merge pull request #24272 from therealpxc/ppssppJoachim F2017-03-30
| |\
| | * ppsspp: 1.1.0 -> 1.3Patrick Callahan2017-03-24
| * | Merge pull request #24467 from kamilchm/vim-goJörg Thalheim2017-03-30
| |\ \
| | * | vim-go: 2017-02-19 -> 1.12Kamil Chmielewski2017-03-30
| * | | vim-elixir: 2017-02-21 -> 2017-03-29Kamil Chmielewski2017-03-30
| |/ /
| * | U-Boot: 2017.01 -> 2017,03Tuomas Tynkkynen2017-03-30
| * | Merge pull request #24417 from edanaher/fix-vim-youcompletemeDaiderd Jordan2017-03-29
| |\ \
| | * | vim-plugins: bump youcompleteme version.Evan Danaher2017-03-28
| * | | Merge #24392: cups-dymo: patch upstream for cups 2.2Vladimír Čunát2017-03-29
| |\ \ \
| | * | | cups-dymo: patch upstream for cups 2.2makefu2017-03-27
| | |/ /
| * | | Merge pull request #24353 from edanaher/fix-vim-knownpluginsJude Taylor2017-03-28
| |\ \ \
| | * | | vim-utils: Handle overriding knownPlugins betters.Evan Danaher2017-03-19
| * | | | treewide: purge maintainers.urkudVladimír Čunát2017-03-27
| * | | | Merge pull request #24265 from ndowens/mxt-appndowens2017-03-26
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | mxt-app:1.26 -> 1.27ndowens2017-03-23
| * | | | Merge branch 'staging'Vladimír Čunát2017-03-24
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | zsnes: only build on LinuxDan Peebles2017-03-23
| | |/ / | |/| |
* | | | cups: fix #24339: broken paths in cups-configVladimír Čunát2017-03-27
| |/ / |/| |
* | | Merge branch 'master' into stagingVladimír Čunát2017-03-23
|\| |
| * | wine: 2.3 -> 2.4Herwig Hochleitner2017-03-22
| * | wine: 2.2 -> 2.3Herwig Hochleitner2017-03-22
| * | wine: 2.1 -> 2.2Herwig Hochleitner2017-03-22
| * | xlockmore: 5.50 -> 5.51Pascal Wittmann2017-03-21
* | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-03-21
|\| |
| * | odroid-xu3-bootloader: use 1MB-capable bootloaderNikolay Amiantov2017-03-21
| * | packetbeat: 5.2.1 -> 5.2.2, build from sourceRobin Gloster2017-03-20
| * | metricbeat: 5.2.1 -> 5.2.2, build from sourceRobin Gloster2017-03-20
| * | heartbeat: 5.2.1 -> 5.2.2, build from sourceRobin Gloster2017-03-20
| * | filebeat: 5.2.1 -> 5.2.2, build from sourceRobin Gloster2017-03-20
| * | packetbeat: init at 5.2.1Tristan Helmich2017-03-20
| * | filebeat: init at 5.2.1Tristan Helmich2017-03-20
| * | metricbeat: init at 5.2.1Tristan Helmich2017-03-20
| * | heartbeat: init at 5.2.1Tristan Helmich2017-03-20
| * | Merge pull request #24112 from abbradar/odroidNikolay Amiantov2017-03-20
| |\ \
| | * | ubootOdroidXU3: initNikolay Amiantov2017-03-20
| | |/
| * / hplip: 3.16.5 -> 3.16.11Jörg Thalheim2017-03-20
| |/
* / Python: replace mkPythonDerivation with buildPythonPackage and format="other";Frederik Rietdijk2017-03-21
|/
* Merge pull request #23256 from edanaher/ensimeMichael Raskin2017-03-18
|\
| * vim-plugins: Add ensime-vim and dependencies.Evan Danaher2017-02-27
| * vim-plugins: Add infrastructure for python[3]Dependencies.Evan Danaher2017-02-27
* | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2017-03-14
|\ \
| * | vlock: improve eintr patchLluís Batlle i Rossell2017-03-11
* | | cups: split the $lib outputVladimír Čunát2017-03-12
* | | cups: minor expression refactoringVladimír Čunát2017-03-12