lol

Merge pull request #178664 from StarGate01/mynewt-newt

mynewt-newt: 1.7.0 -> 1.10.0

authored by

Bobby Rong and committed by
GitHub
c8573980 6806e4e8

+12 -15
+12 -15
pkgs/tools/package-management/mynewt-newt/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub, fetchpatch }: 1 + { lib 2 + , buildGoModule 3 + , fetchFromGitHub 4 + , stdenv 5 + }: 2 6 3 7 buildGoModule rec { 4 8 pname = "mynewt-newt"; 5 - version = "1.7.0"; 9 + version = "1.10.0"; 6 10 7 11 src = fetchFromGitHub { 8 12 owner = "apache"; 9 13 repo = "mynewt-newt"; 10 14 rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag"; 11 - sha256 = "0rwn4ghh7kal8csxlh0w1p29b5m1nam9lkrxla5wdfhnzbsg8hfa"; 15 + sha256 = "sha256-HWZDs4kYWveEqzPRNGNbghc1Yg6hy/Pq3eU5jW8WdHc="; 12 16 }; 13 17 14 - patches = [ 15 - (fetchpatch { 16 - url = "https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch"; 17 - sha256 = "186yha60jzcjq8r04w12rqqh3cin2w974l77hz2ixhmjzyr56wqv"; 18 - }) 19 - (fetchpatch { 20 - url = "https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch"; 21 - sha256 = "01scmq58bfr4c9icqzm79q7a55izflsb3mlx9xn0dv92m3mbprx7"; 22 - }) 23 - ]; 18 + vendorSha256 = "sha256-/LK+NSs7YZkw6TRvBQcn6/SszIwAfXN0rt2AKSBV7CE="; 24 19 25 - vendorSha256 = "1sh9mx3lc28fzvc1yrhz58rlbaac7aq1dqyvxwj98vld3kigpv1z"; 20 + doCheck = false; 26 21 27 - doCheck = false; 22 + # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" 23 + # https://github.com/shirou/gopsutil/issues/976 24 + CGO_ENABLED = if stdenv.isLinux then 1 else 0; 28 25 29 26 meta = with lib; { 30 27 homepage = "https://mynewt.apache.org/";