cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

garble: 20200107 -> 0.5.1, switch to go_1_17

Browse source 
This was pretty straightforward, note that go1.17 is explicitly required
by v0.5.1, and one of the tests requires git, so I added it to the
checkInputs.

Also the tests now pass and don't need the mangle, so I removed the
patch. I left the darwin/aarch64 patch in.
This commit is contained in:
Colin 2022-01-29 16:42:46 -05:00 committed by GitHub
parent bb80dd220b
commit 66d547dec8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/build-support/go/garble.nix
View file

@ -2,25 +2,25 @@
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, lib , lib
, git
}: }:
buildGoModule rec { buildGoModule rec {
pname = "garble"; pname = "garble";
version = "20200107"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "burrowers"; owner = "burrowers";
repo = pname; repo = pname;
rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1"; rev = "v${version}";
sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8="; sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA==";
}; };
vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek="; vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4=";
preBuild = '' # Used for some of the tests.
# https://github.com/burrowers/garble/issues/184 checkInputs = [git];
substituteInPlace testdata/scripts/tiny.txt \
--replace "{6,8}" "{4,8}" preBuild = lib.optionalString (!stdenv.isx86_64) ''
'' + lib.optionalString (!stdenv.isx86_64) ''
# The test assumex amd64 assembly # The test assumex amd64 assembly
rm testdata/scripts/asm.txt rm testdata/scripts/asm.txt
''; '';

3
pkgs/top-level/all-packages.nix
View file

@ -16566,8 +16566,7 @@ with pkgs;
ganv = callPackage ../development/libraries/ganv { }; ganv = callPackage ../development/libraries/ganv { };
garble = callPackage ../build-support/go/garble.nix { garble = callPackage ../build-support/go/garble.nix {
# https://github.com/burrowers/garble/issues/124 buildGoModule = buildGo117Module;
buildGoModule = buildGo115Module;
}; };
gcab = callPackage ../development/libraries/gcab { }; gcab = callPackage ../development/libraries/gcab { };