nixpkgs/pkgs
Christopher Ostrouchov dac171dd5d
merge: fixing changes with nixpkgs since pull-request
- pytest-timeout: no longer requires patch
 - joblib: was improperly merged with the github merge tool (never
   using again)
2018-09-11 14:24:59 -04:00
..
applications pulseaudio-modules-bt: init at unstable-2018-09-11 2018-09-11 10:16:09 +08:00
build-support Merge branch 'no-toPath' 2018-09-06 08:09:53 -04:00
common-updater
data papirus-icon-theme: 20180401 -> 20180816 (#46230) 2018-09-11 00:08:41 +02:00
desktops mate.mate-session-manager: 1.20.1 -> 1.21.0 (#46239) 2018-09-11 00:12:50 +02:00
development merge: fixing changes with nixpkgs since pull-request 2018-09-11 14:24:59 -04:00
games arx-libertatis: 2017-10-30 -> 2018-08-26 (#46039) 2018-09-10 22:08:48 +02:00
misc vimPlugins: Fix update.py, add/update plugins 2018-09-10 21:41:04 +02:00
os-specific Merge pull request #46028 from e-user/pkgs/semodule-utils-2.7 2018-09-10 14:54:33 -05:00
servers Merge pull request #46156 from r-ryantm/auto-update/xcb-util-xrm 2018-09-10 15:00:11 -05:00
shells zsh: 5.5.1 -> 5.6 (#46052) 2018-09-04 23:32:43 +02:00
stdenv Merge pull request #46148 from obsidiansystems/plain-system-host 2018-09-06 09:37:20 -04:00
test
tools Merge pull request #46497 from markuskowa/licenses-15 2018-09-10 22:56:03 +02:00
top-level merge: fixing changes with nixpkgs since pull-request 2018-09-11 14:24:59 -04:00