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
..
default.nix	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
generate.sh	Remove nodejs-6_x which is about to enter EOL	2019-04-04 18:43:06 +01:00
node-packages.nix	node2nix: 1.6.0 -> 1.7.0 and regenerate all Nix expressions, introduce nodePackages_12_x attribute set	2019-06-05 23:48:42 +02:00
nodepkgs.nix	nodejs-8_x: Drop package	2019-08-02 02:34:47 +02:00
pkgs.json	remarkjs: use node2nix generated expressions	2016-09-02 13:02:37 +00:00