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-04-15 21:51:55 -04:00
2019-08-12 22:35:45 +02:00
2019-08-15 13:41:18 +01:00
2019-08-13 15:00:05 -07:00
2019-08-20 19:36:05 +02:00
2019-08-18 12:53:44 +02:00
2019-08-17 10:54:38 +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-06-15 10:06:54 +02:00
2019-06-16 19:59:05 +00:00
2019-06-16 19:59:05 +00:00
2019-08-15 13:41:18 +01:00
2018-12-17 12:34:39 +01:00
2019-08-15 13:41:18 +01:00
2019-06-04 10:59:58 +02: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-09 20:26:19 +00:00
2019-08-15 13:41:18 +01:00
2019-07-06 10:31:14 +02: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-07-29 21:25:14 +02:00
2019-08-15 13:41:18 +01:00
2019-07-20 06:45:54 -07: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-24 10:21:57 +02:00
2019-08-15 13:41:18 +01:00
2019-08-13 11:58:39 +02:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-04-22 10:19:54 +02:00
2019-07-15 09:41:36 +02:00
2019-08-24 08:55:37 +02:00
2019-08-15 13:41:18 +01:00
2019-08-15 13:41:18 +01:00
2019-08-02 08:04:21 -07:00
2019-08-17 10:54:38 +00:00