From 3c66a05a7bfcc3530b04c422b8747fec7f1e6e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Tue, 21 May 2019 08:57:13 +0200 Subject: [PATCH 1/2] multipath-tools: fix download URL The URL was mistakenly truncated in the following commit: 57bccb3cb8f treewide: http -> https sources (#42676) --- pkgs/os-specific/linux/multipath-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 6488f98565a9..2ec74a222438 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "https://git.opensvc.com/"; + url = "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz"; sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm"; }; From c3b6b00bcfdde5c02ddaf7f567bde76b5ac62d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Tue, 21 May 2019 09:01:48 +0200 Subject: [PATCH 2/2] multipath-tools: download URL points to tag for easier package updates --- pkgs/os-specific/linux/multipath-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 2ec74a222438..14996fd76be5 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd, liburcu }: stdenv.mkDerivation rec { - name = "multipath-tools-0.6.2"; + name = "multipath-tools-${version}"; + version = "0.6.2"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz"; + url = "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${version};sf=tgz"; sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm"; };