commit e424d5ef75ecb7398f838162ec17e7262ad3e911 · pyrox.dev/nixpkgs

+8 -2

pkgs/build-support/go/module.nix

···

       41
       41
        
       

     

       42
       42
        
       , ldflags ? [ ]

     

       43
       43
        
       

     

       44
       44
       +
       , GOFLAGS ? [ ]

     

       45
       45
       +
       

     

       44
       46
        
         # needed for buildFlags{,Array} warning

     

       45
       47
        
       , buildFlags ? ""

     

       46
       48
        
       , buildFlagsArray ? ""

     
···

       153
       155
        
       

     

       154
       156
        
           inherit (go) GOOS GOARCH;

     

       155
       157
        
       

     

       156
       156
       -
           GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ];

     

       158
       158
       +
           GOFLAGS = GOFLAGS

     

       159
       159
       +
             ++ lib.optional (!proxyVendor) "-mod=vendor"

     

       160
       160
       +
             ++ lib.optional (!allowGoReference) "-trimpath";

     

       157
       161
        
           inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN;

     

       158
       162
        
       

     

       159
       163
        
           # If not set to an explicit value, set the buildid empty for reproducibility.

     

       160
       160
       -
           ldflags = ldflags ++ lib.optionals (!lib.any (lib.hasPrefix "-buildid=") ldflags) [ "-buildid=" ];

     

       164
       164
       +
           ldflags = ldflags ++ lib.optional (!lib.any (lib.hasPrefix "-buildid=") ldflags) "-buildid=";

     

       161
       165
        
       

     

       162
       166
        
           configurePhase = args.configurePhase or (''

     

       163
       167
        
             runHook preConfigure

     
···

       307
       311
        
       lib.warnIf (buildFlags != "" || buildFlagsArray != "")

     

       308
       312
        
         "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"

     

       309
       313
        
       lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"

     

       314
       314
       +
       lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"

     

       315
       315
       +
       lib.warnIf (lib.any (lib.hasPrefix "-mod=") GOFLAGS) "use `proxyVendor` to control Go module/vendor behavior instead of setting `-mod=` in GOFLAGS"

     

       310
       316
        
         package

+5 -2

pkgs/build-support/go/package.nix

···

       39
       39
        
       

     

       40
       40
        
       , ldflags ? [ ]

     

       41
       41
        
       

     

       42
       42
       +
       , GOFLAGS ? [ ]

     

       43
       43
       +
       

     

       42
       44
        
       # needed for buildFlags{,Array} warning

     

       43
       45
        
       , buildFlags ? ""

     

       44
       46
        
       , buildFlagsArray ? ""

     
···

       89
       91
        
       

     

       90
       92
        
           GO111MODULE = "off";

     

       91
       93
        
           GOTOOLCHAIN = "local";

     

       92
       92
       -
           GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ];

     

       94
       94
       +
           GOFLAGS = GOFLAGS ++ lib.optional (!allowGoReference)  "-trimpath" ;

     

       93
       95
        
       

     

       94
       96
        
           GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);

     

       95
       97
        
       

     

       96
       98
        
           # If not set to an explicit value, set the buildid empty for reproducibility.

     

       97
       97
       -
           ldflags = ldflags ++ lib.optionals (!lib.any (lib.hasPrefix "-buildid=") ldflags) [ "-buildid=" ];

     

       99
       99
       +
           ldflags = ldflags ++ lib.optional (!lib.any (lib.hasPrefix "-buildid=") ldflags) "-buildid=";

     

       98
       100
        
       

     

       99
       101
        
           configurePhase = args.configurePhase or (''

     

       100
       102
        
             runHook preConfigure

     
···

       286
       288
        
       lib.warnIf (buildFlags != "" || buildFlagsArray != "")

     

       287
       289
        
         "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"

     

       288
       290
        
       lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"

     

       291
       291
       +
       lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"

     

       289
       292
        
         package

+1 -1

pkgs/by-name/gc/gcs/package.nix

···

       56
       56
        
         ];

     

       57
       57
        
       

     

       58
       58
        
         # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh

     

       59
       59
       -
         flags = [ "-a -trimpath" ];

     

       59
       59
       +
         flags = [ "-a" ];

     

       60
       60
        
         ldflags = [ "-s" "-w" "-X github.com/richardwilkes/toolbox/cmdline.AppVersion=${version}" ];

     

       61
       61
        
       

     

       62
       62
        
         installPhase = ''

-1

pkgs/by-name/gt/gtrash/package.nix

···

       23
       23
        
         doCheck = false;

     

       24
       24
        
       

     

       25
       25
        
         CGO_ENABLED = 0;

     

       26
       26
       -
         GOFLAGS = [ "-trimpath" ];

     

       27
       26
        
         ldflags = [

     

       28
       27
        
           "-s"

     

       29
       28
        
           "-w"

-1

pkgs/by-name/up/uplosi/package.nix

···

       18
       18
        
       

     

       19
       19
        
         CGO_ENABLED = "0";

     

       20
       20
        
         ldflags = [ "-s" "-w" "-X main.version=${version}" ];

     

       21
       21
       -
         flags = [ "-trimpath" ];

     

       22
       21
        
       

     

       23
       22
        
         nativeBuildInputs = [ installShellFiles ];

     

       24
       23

+1 -1

pkgs/development/tools/language-servers/jq-lsp/default.nix

···

       18
       18
        
       

     

       19
       19
        
         # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml

     

       20
       20
        
         CGO_ENABLED = 0;

     

       21
       21
       -
         GOFLAGS = [ "-trimpath" ];

     

       21
       21
       +
       

     

       22
       22
        
         ldflags = [

     

       23
       23
        
           "-s"

     

       24
       24
        
           "-w"

-2

pkgs/tools/security/slsa-verifier/default.nix

···

       17
       17
        
         vendorHash = "sha256-rCGj2o59US2t/ckqXirEDgYn9dGvVSzMVcFEZosasBc=";

     

       18
       18
        
       

     

       19
       19
        
         CGO_ENABLED = 0;

     

       20
       20
       -
         GO111MODULE = "on";

     

       21
       21
       -
         GOFLAGS = "-trimpath";

     

       22
       20
        
       

     

       23
       21
        
         subPackages = [ "cli/slsa-verifier" ];

     

       24
       22

-4

pkgs/tools/video/go2rtc/default.nix

···

       16
       16
        
       

     

       17
       17
        
         vendorHash = "sha256-KEW3ykEZvL6y1VacDIqtHW9B2RLHlHC29aqJjkEnRqQ=";

     

       18
       18
        
       

     

       19
       19
       -
         buildFlagArrays = [

     

       20
       20
       -
           "-trimpath"

     

       21
       21
       -
         ];

     

       22
       22
       -
       

     

       23
       19
        
         CGO_ENABLED = 0;

     

       24
       20
        
       

     

       25
       21
        
         ldflags = [