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-08-15 13:41:18 +01:00
2019-08-04 04:23:13 -04: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-07 15:04:10 +02:00
2019-08-15 13:41:18 +01:00
2019-06-23 09:13:46 +02:00
2019-08-15 13:41:18 +01:00
2019-08-04 07:27:55 -07:00
2019-08-15 13:41:18 +01: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-08-15 13:41:18 +01:00
2019-07-22 12:02:47 +00:00
2019-08-24 08:55:37 +02:00
2019-08-15 13:41:18 +01:00
2019-08-17 10:54:38 +00:00
2019-08-17 10:54:38 +00:00
2019-08-15 13:41:18 +01:00
2019-08-24 08:55:37 +02:00
2019-06-17 02:49:41 -07:00
2019-08-15 13:41:18 +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-17 10:54:38 +00:00
2019-08-20 00:52:35 -05:00
2019-08-10 16:41:23 +02:00
2019-08-15 13:41:18 +01:00
2019-07-22 18:50:57 -04:00
2019-06-26 23:06:59 +02:00
2019-07-22 12:02:47 +00: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-08-15 13:41:18 +01:00
2019-08-19 16:50:26 -05:00
2019-07-01 13:20:13 +10:00
2019-08-15 13:41:18 +01:00
2019-08-17 10:54:38 +00:00
2019-08-15 13:41:18 +01:00
2019-06-03 03:39:20 -07:00
2019-08-24 08:55:37 +02:00