jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2e6bf42a22
nixpkgs/pkgs/tools
History
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
..
admin Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
archivers treewide: name -> pname 2019-08-17 10:54:38 +00:00
audio Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
backup Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
bluetooth treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
bootloaders/refind treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
cd-dvd treewide: name -> pname 2019-08-17 10:54:38 +00:00
compression Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
filesystems Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
graphics Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
inputmethods Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
misc Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
networking Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
package-management Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
security Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
system Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
text Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
toml2nix
typesetting Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
video treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
virtualization cri-tools: 1.14.0 -> 1.15.0 2019-08-20 22:49:23 +02:00
X11 Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00