Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
2019-03-07 22:27:12 +01:00
2019-07-22 12:02:47 +00:00
2019-08-18 16:22:24 -07:00
2019-08-15 13:41:18 +01:00
2018-12-15 03:50:31 +00:00
2018-12-15 03:50:31 +00:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2018-07-05 12:27:17 +02:00
2019-08-15 13:41:18 +01:00
2019-08-17 10:54:38 +00:00
2019-01-16 20:37:15 +01:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2018-09-08 16:16:26 +02:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-03-24 17:20:19 -05:00
2018-07-22 21:50:19 +02:00
2019-02-27 13:13:16 -05:00
2019-03-06 08:05:16 +08:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-06-01 15:17:52 +00:00
2019-08-15 13:41:18 +01:00
2019-08-24 08:55:37 +02:00
2019-08-15 13:41:18 +01:00
2018-06-22 13:09:47 +02:00
2019-08-15 13:41:18 +01:00
2018-12-11 18:13:21 +01:00