cygwin-iso: fix the most obvious parts of bit rot

Still doesn't build though. Is anyone still using it?

+10 -9
+8 -7
pkgs/build-support/vm/windows/cygwin-iso/default.nix
··· 1 - { stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph 1 + { stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph 2 2 , arch ? "x86_64" 3 3 }: 4 4 ··· 10 10 let 11 11 cygPkgList = if arch == "x86_64" then fetchurl { 12 12 url = "${mirror}/x86_64/setup.ini"; 13 - sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; 13 + sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj"; 14 14 } else fetchurl { 15 15 url = "${mirror}/x86/setup.ini"; 16 - sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; 16 + sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69"; 17 17 }; 18 18 19 19 cygwinCross = (import ../../../../.. { ··· 25 25 inherit arch; 26 26 config = "${arch}-w64-mingw32"; 27 27 }; 28 - }).windows.cygwinSetup.crossDrv; 28 + }).windows.cygwinSetup; 29 29 30 30 makeCygwinClosure = { packages, packageList }: let 31 31 expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' 32 32 python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" 33 33 ''); 34 - gen = { url, md5 }: { 34 + gen = { url, hash }: { 35 35 source = fetchurl { 36 36 url = "${mirror}/${url}"; 37 - inherit md5; 37 + sha512 = hash; 38 38 }; 39 39 target = url; 40 40 }; 41 41 in map gen expr; 42 42 43 43 in import ../../../../../nixos/lib/make-iso9660-image.nix { 44 - inherit stdenv perl cdrkit pathsFromGraph; 44 + inherit stdenv perl xorriso pathsFromGraph; 45 + syslinux = null; 45 46 contents = [ 46 47 { source = "${cygwinCross}/bin/setup.exe"; 47 48 target = "setup.exe";
+2 -2
pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py
··· 63 63 if install_line is None: 64 64 continue 65 65 66 - url, size, md5 = install_line.split(' ', 2) 66 + url, size, hash = install_line.split(' ', 2) 67 67 68 68 pack = [ 69 69 ' {', 70 70 ' url = "{0}";'.format(url), 71 - ' md5 = "{0}";'.format(md5), 71 + ' hash = "{0}";'.format(hash), 72 72 ' }', 73 73 ]; 74 74 sys.stdout.write('\n'.join(pack) + '\n')