From 167e609faae5825a77b6d9cb59f3046a1c8dae5d Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 30 Dec 2018 20:27:42 +0100 Subject: [PATCH] xorg: use https for sources without mirrors --- pkgs/servers/x11/xorg/default.nix | 18 +++++++++--------- pkgs/servers/x11/xorg/tarballs.list | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1f953e89ec88..e181179a87dd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1239,7 +1239,7 @@ lib.makeScope newScope (self: with self; { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; + url = https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1252,7 +1252,7 @@ lib.makeScope newScope (self: with self; { name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; + url = https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1590,7 +1590,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-proto-1.13"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1603,7 +1603,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1629,7 +1629,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1642,7 +1642,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1655,7 +1655,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1668,7 +1668,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1681,7 +1681,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 906395514063..8c2254db891f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,13 +1,13 @@ +https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 +https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 -http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.4.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 mirror://xorg/individual/app/bitmap-1.0.8.tar.gz