1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
nixpkgs/pkgs/tools
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
..
admin ansible: install man pages (#44980) 2018-08-13 15:30:41 +02:00
archivers Merge branch 'master' into add-missing-licenses 2018-08-09 13:10:27 +02:00
audio abcm2ps: 8.13.23 -> 8.13.24 2018-08-02 12:33:08 +02:00
backup Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
bluetooth Merge pull request #44808 from r-ryantm/auto-update/blueman 2018-08-09 13:53:22 +08:00
bootloaders/refind refind: add license 2018-08-06 12:21:56 +02:00
cd-dvd brasero: inherit meta in wrapper 2018-08-05 16:06:55 +02:00
compression Merge master into staging 2018-08-09 18:28:15 +02:00
filesystems Merge branch 'master' into staging-next 2018-08-12 10:33:41 +02:00
graphics Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
inputmethods Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
misc Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
networking Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
nix/info
package-management disnixos: 0.7 -> 0.7.1 2018-08-12 22:24:21 +02:00
security Merge branch 'master' into staging-next 2018-08-13 20:43:59 +02:00
system Merge branch 'master' into staging-next 2018-08-12 10:33:41 +02:00
text Merge branch 'master' into staging-next 2018-08-12 10:33:41 +02:00
typesetting Merge branch 'master' into staging-next 2018-08-12 10:33:41 +02:00
video vnc2flv: add license 2018-08-04 16:13:28 +02:00
virtualization treewide: fix build with disallowed aliases (#43872) 2018-07-21 22:03:24 -04:00
X11 Merge branch 'master' into add-missing-licenses 2018-08-09 13:10:27 +02:00