Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

java: More default cleanups

+3 -3
+1 -1
nixos/modules/services/search/solr.nix
··· 44 44 45 45 javaPackage = mkOption { 46 46 type = types.package; 47 - default = pkgs.openjre; 47 + default = pkgs.jre; 48 48 description = '' 49 49 Which Java derivation to use for running solr. 50 50 '';
+1 -1
nixos/modules/services/web-servers/winstone.nix
··· 30 30 31 31 javaPackage = mkOption { 32 32 type = types.package; 33 - default = pkgs.openjre; 33 + default = pkgs.jre; 34 34 description = '' 35 35 Which Java derivation to use for running Winstone. 36 36 '';
+1 -1
pkgs/tools/graphics/zxing/default.nix
··· 1 - {stdenv, fetchurl, openjre, jre ? openjre}: 1 + { stdenv, fetchurl, jre }: 2 2 stdenv.mkDerivation rec { 3 3 name = "zxing-${version}"; 4 4 version = "3.1.0";