Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ace148f214a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ce2f5a028e2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2020

  1. Merge pull request #102418 from asbachb/openjdk11-from-github 

    openjdk: download from mercurial repository to GitHub
(cherry picked from commit 01816a4)
    @NeQuissimus
    NeQuissimus committed Nov 18, 2020
    Copy the full SHA
    2ce2f5a View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/compilers/openjdk/11.nix
10 changes: 6 additions & 4 deletions pkgs/development/compilers/openjdk/11.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
@@ -18,9 +18,11 @@ let
pname = "openjdk" + lib.optionalString headless "-headless";
version = "${major}.${minor}.${update}+${build}";

src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858";
src = fetchFromGitHub {
owner = "openjdk";
repo = "jdk${major}u";
rev = "jdk-${version}";
sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
};

nativeBuildInputs = [ pkgconfig autoconf ];