perkeep: Build with go 1.9

+47 -3
+43 -2
pkgs/applications/misc/perkeep/default.nix
··· 1 - { stdenv, lib, go_1_8, fetchzip, git }: 1 + { stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: 2 + 3 + # When perkeep is updated all deps in the let block should be removed 4 + let 5 + gopherjs = fetchFromGitHub { 6 + owner = "gopherjs"; 7 + repo = "gopherjs"; 8 + # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45 9 + rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7"; 10 + sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc"; 11 + }; 12 + 13 + gotool = fetchFromGitHub { 14 + owner = "kisielk"; 15 + repo = "gotool"; 16 + rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; 17 + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; 18 + }; 19 + 20 + gcimporter15 = fetchgit { 21 + url = "https://go.googlesource.com/tools"; 22 + rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97"; 23 + sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n"; 24 + }; 2 25 26 + in 3 27 stdenv.mkDerivation rec { 4 28 name = "perkeep-${version}"; 5 29 version = "20170505"; ··· 9 33 sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; 10 34 }; 11 35 12 - buildInputs = [ git go_1_8 ]; 36 + # When perkeep is updated postPatch should be removed 37 + postPatch = '' 38 + rm -r ./vendor/github.com/gopherjs/gopherjs/ 39 + cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs 40 + mkdir -p ./vendor/github.com/kisielk/ 41 + cp -a ${gotool} ./vendor/github.com/kisielk/gotool 42 + mkdir -p ./vendor/golang.org/x/tools/go 43 + cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15 44 + 45 + substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \ 46 + --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"' 47 + 48 + substituteInPlace ./make.go \ 49 + --replace "goVersionMinor = '8'" "goVersionMinor = '9'" \ 50 + --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'" 51 + ''; 52 + 53 + buildInputs = [ git go ]; 13 54 14 55 goPackagePath = ""; 15 56 buildPhase = ''
+4 -1
pkgs/top-level/all-packages.nix
··· 14684 14684 openjpeg = openjpeg_1; 14685 14685 }; 14686 14686 14687 - perkeep = callPackage ../applications/misc/perkeep { }; 14687 + perkeep = callPackage ../applications/misc/perkeep { 14688 + # Perkeep is very particular about which go version to build with. 14689 + go = go_1_9; 14690 + }; 14688 14691 14689 14692 canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; 14690 14693