diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 67321aaa01ff..9044dc44f2a5 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -5,19 +5,7 @@ , nixosTests }: let - version = "0.10.0"; - - # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here. - # ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96 - skipTest = lineOffset: testCase: file: - let - jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); - in - '' - sed -i -e '/${testCase}/{ - ${jumpAndAppend} t.Skip(); - }' ${file} - ''; + version = "0.11.0"; in buildGoModule { @@ -29,20 +17,13 @@ buildGoModule { owner = "scionproto"; repo = "scion"; rev = "v${version}"; - hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI="; + hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY="; }; - vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8="; + vendorHash = "sha256-akFbHgo8xI2/4aQsyutjhXPM5d0A3se3kG/6Ebw1Qcs="; excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ]; - # This can be removed in the next release of scion since its fixed upstream - # https://github.com/scionproto/scion/pull/4476 - postConfigure = '' - # This test needs docker, so lets skip it - ${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"} - ''; - postInstall = '' set +e mv $out/bin/gateway $out/bin/scion-ip-gateway @@ -55,13 +36,6 @@ buildGoModule { doCheck = true; - patches = [ - (fetchpatch2 { - url = "https://github.com/scionproto/scion/commit/cb7fa6d6aab55c9eb90556c2b996b87539f8aa02.patch"; - hash = "sha256-mMGJMPB6T7KeDXjEXffdrhzyKwaFmhuisK6PjHOJIdU="; - }) - ]; - passthru.tests = { inherit (nixosTests) scion-freestanding-deployment; };