commit 0d6d47edd10ad32d1feb5ee1c7e2d78d68098e99 · pyrox.dev/nixpkgs

+8 -10

pkgs/development/compilers/go/1.8.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin

     

       2
       2
        
       , perl, which, pkgconfig, patch, fetchpatch

     

       3
       3
       -
       , pcre, cacert

     

       3
       3
       +
       , pcre, cacert, llvm

     

       4
       4
        
       , Security, Foundation, bash }:

     

       5
       5
        
       

     

       6
       6
        
       let

     
···

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
        
         name = "go-${version}";

     

       27
       27
       -
         version = "1.8";

     

       27
       27
       +
         version = "1.8.1";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
        
           owner = "golang";

     

       31
       31
        
           repo = "go";

     

       32
       32
        
           rev = "go${version}";

     

       33
       33
       -
           sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl";

     

       33
       33
       +
           sha256 = "1157mmzjpk887cpcpn2qy9c69anc22c4p3cjpl84zl7an41x660j";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         # perl is used for testing go vet

     
···

       110
       110
        
             ./ssl-cert-file.patch

     

       111
       111
        
             ./creds-test.patch

     

       112
       112
        
             ./remove-test-pie-1.8.patch

     

       113
       113
       -
       

     

       114
       114
       -
             # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch

     

       115
       115
       -
             # works fine here for now.

     

       116
       116
       -
             (fetchpatch {

     

       117
       117
       -
               url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";

     

       118
       118
       -
               sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";

     

       119
       119
       -
             })

     

       120
       113
        
           ];

     

       114
       114
       +
       

     

       115
       115
       +
         postPatch = optionalString stdenv.isDarwin ''

     

       116
       116
       +
           echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"

     

       117
       117
       +
           substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil

     

       118
       118
       +
         '';

     

       121
       119
        
       

     

       122
       120
        
         NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

     

       123
       121

+2 -4

pkgs/top-level/all-packages.nix

···

       5358
       5358
        
           inherit (darwin.apple_sdk.frameworks) Security Foundation;

     

       5359
       5359
        
         };

     

       5360
       5360
        
       

     

       5361
       5361
       -
         go_1_8 = callPackage ../development/compilers/go/1.8.nix ({

     

       5361
       5361
       +
         go_1_8 = callPackage ../development/compilers/go/1.8.nix {

     

       5362
       5362
        
           inherit (darwin.apple_sdk.frameworks) Security Foundation;

     

       5363
       5363
       -
         } // stdenv.lib.optionalAttrs stdenv.isDarwin {

     

       5364
       5364
       -
           stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;

     

       5365
       5365
       -
         });

     

       5363
       5363
       +
         };

     

       5366
       5364
        
       

     

       5367
       5365
        
         go = go_1_8;

     

       5368
       5366