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-06-16 19:59:05 +00:00
2019-04-01 00:40:03 -04: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-20 23:00:21 +02:00
2019-06-22 14:35:32 +02:00
2019-06-20 08:39:00 +02:00
2019-06-25 15:31:55 +02:00
2019-06-30 14:00:42 -07:00
2019-06-01 15:17:52 +00:00
2019-06-01 15:17:52 +00:00
2019-08-15 13:41:18 +01:00
2019-03-27 12:54:17 +01:00
2019-08-15 13:41:18 +01:00
2019-07-20 12:33:30 +08:00
2019-08-15 13:41:18 +01:00
2019-08-11 12:15:33 +02:00
2019-08-15 13:41:18 +01:00
2019-07-22 12:02:47 +00:00
2019-07-22 12:02:47 +00: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-07-30 22:38:15 -05:00
2019-08-17 10:54:38 +00:00
2019-08-15 13:41:18 +01:00
2019-06-01 15:17:52 +00:00
2019-06-01 15:17:52 +00:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-07-01 04:23:51 -04:00
2019-05-07 07:12:55 +01:00
2019-08-15 13:41:18 +01:00
2019-06-16 19:59:05 +00: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-08-06 19:47:15 -04:00
2019-08-10 13:18:53 +03:00
2019-08-15 13:41:18 +01:00
2019-07-30 03:41:32 +02:00