diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-06 14:24:46 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-06 14:24:46 +0100 |
commit | ff101946a846bff067ee3d1f4c18fa2c8a9e7f79 (patch) | |
tree | 01fffd5f6fa291f1d80b6ca024d5c62a2b96653e /pkgs | |
parent | 72f8f89849ebe341c697486f63df7fbac35f6b5c (diff) | |
parent | dbc771f2e107fa364493c968796a8772d569e4a8 (diff) |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1503899
Diffstat (limited to 'pkgs')