scion: 0.10.0 -> 0.11.0

Includes removal of TestOpensslCompatible skipTest, skipTest function,
and patch upstreamed in 0.11.0

authored by Robert James Hernandez and committed by Emery Hemingway b8ef7d38 29df774f

+3 -29
+3 -29
pkgs/by-name/sc/scion/package.nix
··· 5 5 , nixosTests 6 6 }: 7 7 let 8 - version = "0.10.0"; 9 - 10 - # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here. 11 - # ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96 12 - skipTest = lineOffset: testCase: file: 13 - let 14 - jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); 15 - in 16 - '' 17 - sed -i -e '/${testCase}/{ 18 - ${jumpAndAppend} t.Skip(); 19 - }' ${file} 20 - ''; 8 + version = "0.11.0"; 21 9 in 22 10 23 11 buildGoModule { ··· 29 17 owner = "scionproto"; 30 18 repo = "scion"; 31 19 rev = "v${version}"; 32 - hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI="; 20 + hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY="; 33 21 }; 34 22 35 - vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8="; 23 + vendorHash = "sha256-akFbHgo8xI2/4aQsyutjhXPM5d0A3se3kG/6Ebw1Qcs="; 36 24 37 25 excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ]; 38 26 39 - # This can be removed in the next release of scion since its fixed upstream 40 - # https://github.com/scionproto/scion/pull/4476 41 - postConfigure = '' 42 - # This test needs docker, so lets skip it 43 - ${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"} 44 - ''; 45 - 46 27 postInstall = '' 47 28 set +e 48 29 mv $out/bin/gateway $out/bin/scion-ip-gateway ··· 54 35 ''; 55 36 56 37 doCheck = true; 57 - 58 - patches = [ 59 - (fetchpatch2 { 60 - url = "https://github.com/scionproto/scion/commit/cb7fa6d6aab55c9eb90556c2b996b87539f8aa02.patch"; 61 - hash = "sha256-mMGJMPB6T7KeDXjEXffdrhzyKwaFmhuisK6PjHOJIdU="; 62 - }) 63 - ]; 64 38 65 39 passthru.tests = { 66 40 inherit (nixosTests) scion-freestanding-deployment;