1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:48:10 +00:00
Commit graph

5 commits

Author SHA1 Message Date
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
gnidorah 95cec2ffe3 kde2-decoration: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
gnidorah b6d92b89e3 twilight, kde2-decoration: add myself to maintainers 2018-07-28 17:45:45 +03:00
medovuxa 99770e785a kde2-decoration: init at 2017-03-15 2017-12-31 10:21:45 +03:00