git.iko.soy/typeable/nixpkgs
on master help sign in
grobi: fix failing test on go 1.15
commitb23d2973b6f1237b13a4d4ef5d85763443a9ad4a authorzowoq <59103226+zowoq@users.noreply.github.com> dateThu 19 Nov 2020, 08:50 (6 years ago) parentf2201db
2 files changed+10−4
pkgs/tools/X11/grobi/default.nix+9−1 pkgs/top-level/all-packages.nix+1−3
pkgs/tools/X11/grobi/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, buildGoModule }:
1+{ stdenv, fetchFromGitHub, buildGoModule, fetchpatch }:
22
33buildGoModule rec {
44 version = "0.6.0";
@@ -13,6 +13,14 @@ buildGoModule rec {
1313
1414 vendorSha256 = "1ibwx5rbxkygfx78j3g364dmbwwa5b34qmzq3sqcbrsnv8rzrwvj";
1515
16+ patches = [
17+ # fix failing test on go 1.15
18+ (fetchpatch {
19+ url = "https://github.com/fd0/grobi/commit/176988ab087ff92d1408fbc454c77263457f3d7e.patch";
20+ sha256 = "0j8y3gns4lm0qxqxzmdn2ll0kq34mmfhf83lvsq13iqhp5bx3y31";
21+ })
22+ ];
23+
1624 meta = with stdenv.lib; {
1725 homepage = "https://github.com/fd0/grobi";
1826 description = "Automatically configure monitors/outputs for Xorg via RANDR";
pkgs/top-level/all-packages.nix+1−3
@@ -2236,9 +2236,7 @@ in
22362236
22372237 gringo = callPackage ../tools/misc/gringo { };
22382238
2239− grobi = callPackage ../tools/X11/grobi {
2240− buildGoModule = buildGo114Module;
2241− };
2239+ grobi = callPackage ../tools/X11/grobi { };
22422240
22432241 gscan2pdf = callPackage ../applications/graphics/gscan2pdf { };
22442242