Merge pull request #17720 from oxij/fix-xen

Fix xen build

authored by Domen Kožar and committed by GitHub 584c19b4 f396a0b4

+20 -21
+11 -12
pkgs/applications/virtualization/xen/4.5.0.nix
··· 2 2 3 3 let 4 4 # Xen 4.5.0 5 - xenConfig = { 6 - name = "xen-4.5.0"; 5 + xenConfig = rec { 7 6 version = "4.5.0"; 7 + name = "xen-${version}"; 8 8 9 9 src = fetchurl { 10 - url = "http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz"; 10 + url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; 11 11 sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv"; 12 12 }; 13 13 ··· 15 15 firmwareGits = 16 16 [ # tag 1.7.5 17 17 { git = { name = "seabios"; 18 - url = git://xenbits.xen.org/seabios.git; 18 + url = https://xenbits.xen.org/git-http/seabios.git; 19 19 rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; 20 - sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb"; 20 + sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; 21 21 }; 22 22 patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; 23 23 } 24 24 { git = { name = "ovmf"; 25 - url = git://xenbits.xen.org/ovmf.git; 25 + url = https://xenbits.xen.org/git-http/ovmf.git; 26 26 rev = "447d264115c476142f884af0be287622cd244423"; 27 27 sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; 28 28 }; ··· 32 32 toolsGits = 33 33 [ # tag qemu-xen-4.5.0 34 34 { git = { name = "qemu-xen"; 35 - url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; 35 + url = https://xenbits.xen.org/git-http/qemu-xen.git; 36 36 rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99"; 37 - sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z"; 37 + sha256 = "0yp9vmna3yl28vm5fkirghzhndaihmsm34fjzgr9sl6s46wx5yzg"; 38 38 }; 39 39 } 40 40 # tag xen-4.5.0 41 41 { git = { name = "qemu-xen-traditional"; 42 - url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; 42 + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; 43 43 rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22"; 44 - sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af"; 44 + sha256 = "1lxlf1s81y5j0rhzzm1f4sbyrnbvd32vxiczs1qjcg6ls866vlki"; 45 45 }; 46 46 } 47 47 { git = { name = "xen-libhvm"; 48 - url = "https://github.com/ts468/xen-libhvm"; 48 + url = https://github.com/ts468/xen-libhvm; 49 49 rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; 50 50 sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; 51 51 }; ··· 77 77 }; 78 78 79 79 in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) 80 -
+9 -9
pkgs/applications/virtualization/xen/4.5.2.nix
··· 15 15 firmwareGits = 16 16 [ # tag 1.7.5 17 17 { git = { name = "seabios"; 18 - url = git://xenbits.xen.org/seabios.git; 18 + url = https://xenbits.xen.org/git-http/seabios.git; 19 19 rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; 20 - sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb"; 20 + sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; 21 21 }; 22 22 patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; 23 23 } 24 24 { git = { name = "ovmf"; 25 - url = git://xenbits.xen.org/ovmf.git; 25 + url = https://xenbits.xen.org/git-http/ovmf.git; 26 26 rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; 27 - sha256 = "1ncb8dpqzaj3s8am44jvclhby40hwczljz0a1gd282h9yr4k4sk2"; 27 + sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq"; 28 28 }; 29 29 } 30 30 ]; ··· 32 32 toolsGits = 33 33 [ # tag qemu-xen-4.5.2 34 34 { git = { name = "qemu-xen"; 35 - url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; 35 + url = https://xenbits.xen.org/git-http/qemu-xen.git; 36 36 rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d"; 37 - sha256 = "1qflb3j8qcvipavybqhi0ql7m2bx51lhzgmf7pdbls8minpvdzg2"; 37 + sha256 = "00h6hc1y19y9wafxk01hvwm2j8lysz26wi2dnv8md76zxavg4maa"; 38 38 }; 39 39 } 40 40 # tag xen-4.5.2 41 41 { git = { name = "qemu-xen-traditional"; 42 - url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; 42 + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; 43 43 rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0"; 44 - sha256 = "14fxdsnkq729z5glkifdpz26idmn7fl38w1v97xj8cf6ifvk76cz"; 44 + sha256 = "07jwpxgk9ls5hma6vv1frnx1aczlvpddlgiyii9qmmlxxwjs21yj"; 45 45 }; 46 46 } 47 47 { git = { name = "xen-libhvm"; 48 - url = "https://github.com/ts468/xen-libhvm"; 48 + url = https://github.com/ts468/xen-libhvm; 49 49 rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; 50 50 sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; 51 51 };