From 16ce708555ccecfd49c0612be6da89dd04b9cc9e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 13 Aug 2016 21:47:27 +0000 Subject: [PATCH 1/2] xen: fix urls and hashes (fallout from #15469) --- pkgs/applications/virtualization/xen/4.5.0.nix | 16 ++++++++-------- pkgs/applications/virtualization/xen/4.5.2.nix | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix index 48b3ee4d75b1..b49fc9abc217 100644 --- a/pkgs/applications/virtualization/xen/4.5.0.nix +++ b/pkgs/applications/virtualization/xen/4.5.0.nix @@ -15,14 +15,14 @@ let firmwareGits = [ # tag 1.7.5 { git = { name = "seabios"; - url = git://xenbits.xen.org/seabios.git; + url = https://xenbits.xen.org/git-http/seabios.git; rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; - sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb"; + sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; }; patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; } { git = { name = "ovmf"; - url = git://xenbits.xen.org/ovmf.git; + url = https://xenbits.xen.org/git-http/ovmf.git; rev = "447d264115c476142f884af0be287622cd244423"; sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; }; @@ -32,20 +32,20 @@ let toolsGits = [ # tag qemu-xen-4.5.0 { git = { name = "qemu-xen"; - url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; + url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99"; - sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z"; + sha256 = "0yp9vmna3yl28vm5fkirghzhndaihmsm34fjzgr9sl6s46wx5yzg"; }; } # tag xen-4.5.0 { git = { name = "qemu-xen-traditional"; - url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22"; - sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af"; + sha256 = "1lxlf1s81y5j0rhzzm1f4sbyrnbvd32vxiczs1qjcg6ls866vlki"; }; } { git = { name = "xen-libhvm"; - url = "https://github.com/ts468/xen-libhvm"; + url = https://github.com/ts468/xen-libhvm; rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; }; diff --git a/pkgs/applications/virtualization/xen/4.5.2.nix b/pkgs/applications/virtualization/xen/4.5.2.nix index f8f7630189f2..e0b13edb1f23 100644 --- a/pkgs/applications/virtualization/xen/4.5.2.nix +++ b/pkgs/applications/virtualization/xen/4.5.2.nix @@ -15,16 +15,16 @@ let firmwareGits = [ # tag 1.7.5 { git = { name = "seabios"; - url = git://xenbits.xen.org/seabios.git; + url = https://xenbits.xen.org/git-http/seabios.git; rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; - sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb"; + sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; }; patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; } { git = { name = "ovmf"; - url = git://xenbits.xen.org/ovmf.git; + url = https://xenbits.xen.org/git-http/ovmf.git; rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; - sha256 = "1ncb8dpqzaj3s8am44jvclhby40hwczljz0a1gd282h9yr4k4sk2"; + sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq"; }; } ]; @@ -32,20 +32,20 @@ let toolsGits = [ # tag qemu-xen-4.5.2 { git = { name = "qemu-xen"; - url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; + url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d"; - sha256 = "1qflb3j8qcvipavybqhi0ql7m2bx51lhzgmf7pdbls8minpvdzg2"; + sha256 = "00h6hc1y19y9wafxk01hvwm2j8lysz26wi2dnv8md76zxavg4maa"; }; } # tag xen-4.5.2 { git = { name = "qemu-xen-traditional"; - url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0"; - sha256 = "14fxdsnkq729z5glkifdpz26idmn7fl38w1v97xj8cf6ifvk76cz"; + sha256 = "07jwpxgk9ls5hma6vv1frnx1aczlvpddlgiyii9qmmlxxwjs21yj"; }; } { git = { name = "xen-libhvm"; - url = "https://github.com/ts468/xen-libhvm"; + url = https://github.com/ts468/xen-libhvm; rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; }; From fdca71776a452cd823746c0551d80b246016b1aa Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 13 Aug 2016 21:49:35 +0000 Subject: [PATCH 2/2] xen: cleanup 4.5.0 expression a bit --- pkgs/applications/virtualization/xen/4.5.0.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix index b49fc9abc217..887734ac6b99 100644 --- a/pkgs/applications/virtualization/xen/4.5.0.nix +++ b/pkgs/applications/virtualization/xen/4.5.0.nix @@ -2,12 +2,12 @@ let # Xen 4.5.0 - xenConfig = { - name = "xen-4.5.0"; + xenConfig = rec { version = "4.5.0"; + name = "xen-${version}"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz"; + url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv"; }; @@ -77,4 +77,3 @@ let }; in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) -