lol

Merge pull request #209304 from Luflosi/update/kubo-migrator

authored by

Sandro and committed by
GitHub
7dce27fe c3c83d05

+19 -4
+16 -1
pkgs/applications/networking/kubo-migrator/all-migrations.nix
··· 15 15 inherit (kubo-migrator-unwrapped) src; 16 16 sourceRoot = "source/${pname}"; 17 17 vendorSha256 = null; 18 + # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match 19 + # See https://github.com/ipfs/fs-repo-migrations/pull/163 20 + postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' 21 + substituteInPlace 'vendor/github.com/marten-seemann/qtls-go1-15/common.go' \ 22 + --replace \ 23 + '"container/list"' \ 24 + '"container/list" 25 + "context"' \ 26 + --replace \ 27 + 'config *Config' \ 28 + 'config *Config 29 + ctx context.Context' 30 + ''; 18 31 doCheck = false; 19 32 meta = kubo-migrator-unwrapped.meta // { 20 33 mainProgram = pname; ··· 23 36 }; 24 37 25 38 # Concatenation of the latest repo version and the version of that migration 26 - version = "12.1.0.2"; 39 + version = "13.1.0.0"; 27 40 41 + fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0"; 28 42 fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; 29 43 fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1"; 30 44 fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1"; ··· 39 53 fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; 40 54 41 55 all-migrations = [ 56 + fs-repo-12-to-13 42 57 fs-repo-11-to-12 43 58 fs-repo-10-to-11 44 59 fs-repo-9-to-10
+3 -3
pkgs/applications/networking/kubo-migrator/unwrapped.nix
··· 15 15 # The fs-repo-migrations code itself is the same between 16 16 # the two versions but the migration code, which is built 17 17 # into separate binaries, is not. 18 - rev = "fs-repo-11-to-12/v1.0.2"; 19 - sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik="; 18 + rev = "fs-repo-12-to-13/v1.0.0"; 19 + hash = "sha256-QQone7E2Be+jVfnrwqQ1Ny4jo6mSDHhaY3ErkNdn2f8="; 20 20 }; 21 21 22 22 sourceRoot = "source/fs-repo-migrations"; 23 23 24 - vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; 24 + vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; 25 25 26 26 doCheck = false; 27 27