Commit graph

2 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
Stefano Mazzucco
a6d234e9e9 adoptopenjdk-icedtea-web: rename from icedtea_web
This is a follow up of https://github.com/NixOS/nixpkgs/pull/66422

- rename icedtea_web to adoptopenjdk-icedtea-web to reflect the new governance
- add icedtea_web and icedtea8_web to aliases.nix for backwards compatibility
- update the attribute name where icedtea_web is used
2019-08-23 21:12:59 +01:00
Renamed from pkgs/development/compilers/icedtea-web/default.nix (Browse further)