commit 1f6f9b0d21b6dd1826de7041508b6594c8cf42fd · pyrox.dev/nixpkgs

+67 -75
pkgs/development/compilers/rust/cargo.nix
···

       15
       15
        
         rustc,

     

       16
       16
        
         auditable ? !cargo-auditable.meta.broken,

     

       17
       17
        
         cargo-auditable,

     

       18
       18
       -
         pkgsBuildBuild,

     

       19
       18
        
       }:

     

       20
       19
        
       

     

       21
       20
        
       rustPlatform.buildRustPackage.override

     

       22
       21
        
         {

     

       23
       22
        
           cargo-auditable = cargo-auditable.bootstrap;

     

       24
       23
        
         }

     

       25
       25
       -
         (

     

       26
       26
       -
           {

     

       27
       27
       -
             pname = "cargo";

     

       28
       28
       -
             inherit (rustc.unwrapped) version src;

     

       24
       24
       +
         {

     

       25
       25
       +
           pname = "cargo";

     

       26
       26
       +
           inherit (rustc.unwrapped) version src;

     

       29
       27
        
       

     

       30
       30
       -
             # the rust source tarball already has all the dependencies vendored, no need to fetch them again

     

       31
       31
       -
             cargoVendorDir = "vendor";

     

       32
       32
       -
             buildAndTestSubdir = "src/tools/cargo";

     

       28
       28
       +
           # the rust source tarball already has all the dependencies vendored, no need to fetch them again

     

       29
       29
       +
           cargoVendorDir = "vendor";

     

       30
       30
       +
           buildAndTestSubdir = "src/tools/cargo";

     

       33
       31
        
       

     

       34
       34
       -
             inherit auditable;

     

       32
       32
       +
           inherit auditable;

     

       35
       33
        
       

     

       36
       36
       -
             passthru = {

     

       37
       37
       -
               rustc = rustc;

     

       38
       38
       -
               inherit (rustc.unwrapped) tests;

     

       39
       39
       -
             };

     

       34
       34
       +
           passthru = {

     

       35
       35
       +
             rustc = rustc;

     

       36
       36
       +
             inherit (rustc.unwrapped) tests;

     

       37
       37
       +
           };

     

       40
       38
        
       

     

       41
       41
       -
             # changes hash of vendor directory otherwise

     

       42
       42
       -
             dontUpdateAutotoolsGnuConfigScripts = true;

     

       39
       39
       +
           # changes hash of vendor directory otherwise

     

       40
       40
       +
           dontUpdateAutotoolsGnuConfigScripts = true;

     

       43
       41
        
       

     

       44
       44
       -
             nativeBuildInputs = [

     

       45
       45
       -
               pkg-config

     

       46
       46
       -
               cmake

     

       47
       47
       -
               installShellFiles

     

       48
       48
       -
               makeWrapper

     

       49
       49
       -
               (lib.getDev pkgsHostHost.curl)

     

       50
       50
       -
               zlib

     

       51
       51
       -
             ];

     

       52
       52
       -
             buildInputs = [

     

       53
       53
       -
               file

     

       54
       54
       -
               curl

     

       55
       55
       -
               python3

     

       56
       56
       -
               openssl

     

       57
       57
       -
               zlib

     

       58
       58
       -
             ];

     

       42
       42
       +
           nativeBuildInputs = [

     

       43
       43
       +
             pkg-config

     

       44
       44
       +
             cmake

     

       45
       45
       +
             installShellFiles

     

       46
       46
       +
             makeWrapper

     

       47
       47
       +
             (lib.getDev pkgsHostHost.curl)

     

       48
       48
       +
             zlib

     

       49
       49
       +
           ];

     

       50
       50
       +
           buildInputs = [

     

       51
       51
       +
             file

     

       52
       52
       +
             curl

     

       53
       53
       +
             python3

     

       54
       54
       +
             openssl

     

       55
       55
       +
             zlib

     

       56
       56
       +
           ];

     

       59
       57
        
       

     

       60
       60
       -
             # cargo uses git-rs which is made for a version of libgit2 from recent master that

     

       61
       61
       -
             # is not compatible with the current version in nixpkgs.

     

       62
       62
       -
             #LIBGIT2_SYS_USE_PKG_CONFIG = 1;

     

       58
       58
       +
           # cargo uses git-rs which is made for a version of libgit2 from recent master that

     

       59
       59
       +
           # is not compatible with the current version in nixpkgs.

     

       60
       60
       +
           #LIBGIT2_SYS_USE_PKG_CONFIG = 1;

     

       63
       61
        
       

     

       64
       64
       -
             # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel

     

       65
       65
       -
             RUSTC_BOOTSTRAP = 1;

     

       62
       62
       +
           # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel

     

       63
       63
       +
           RUSTC_BOOTSTRAP = 1;

     

       66
       64
        
       

     

       67
       67
       -
             postInstall = ''

     

       68
       68
       -
               wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"

     

       65
       65
       +
           postInstall = ''

     

       66
       66
       +
             wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"

     

       69
       67
        
       

     

       70
       70
       -
               installManPage src/tools/cargo/src/etc/man/*

     

       68
       68
       +
             installManPage src/tools/cargo/src/etc/man/*

     

       71
       69
        
       

     

       72
       72
       -
               installShellCompletion --bash --name cargo \

     

       73
       73
       -
                 src/tools/cargo/src/etc/cargo.bashcomp.sh

     

       70
       70
       +
             installShellCompletion --bash --name cargo \

     

       71
       71
       +
               src/tools/cargo/src/etc/cargo.bashcomp.sh

     

       74
       72
        
       

     

       75
       75
       -
               installShellCompletion --zsh src/tools/cargo/src/etc/_cargo

     

       76
       76
       -
             '';

     

       73
       73
       +
             installShellCompletion --zsh src/tools/cargo/src/etc/_cargo

     

       74
       74
       +
           '';

     

       77
       75
        
       

     

       78
       78
       -
             checkPhase = ''

     

       79
       79
       -
               # Disable cross compilation tests

     

       80
       80
       -
               export CFG_DISABLE_CROSS_TESTS=1

     

       81
       81
       -
               cargo test

     

       82
       82
       -
             '';

     

       76
       76
       +
           checkPhase = ''

     

       77
       77
       +
             # Disable cross compilation tests

     

       78
       78
       +
             export CFG_DISABLE_CROSS_TESTS=1

     

       79
       79
       +
             cargo test

     

       80
       80
       +
           '';

     

       83
       81
        
       

     

       84
       84
       -
             # Disable check phase as there are failures (4 tests fail)

     

       85
       85
       -
             doCheck = false;

     

       82
       82
       +
           # Disable check phase as there are failures (4 tests fail)

     

       83
       83
       +
           doCheck = false;

     

       86
       84
        
       

     

       87
       87
       -
             doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf;

     

       88
       88
       -
             installCheckPhase = ''

     

       89
       89
       -
               runHook preInstallCheck

     

       90
       90
       -
               ${stdenv.cc.targetPrefix}readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so'

     

       91
       91
       -
               runHook postInstallCheck

     

       92
       92
       -
             '';

     

       85
       85
       +
           doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf;

     

       86
       86
       +
           installCheckPhase = ''

     

       87
       87
       +
             runHook preInstallCheck

     

       88
       88
       +
             ${stdenv.cc.targetPrefix}readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so'

     

       89
       89
       +
             runHook postInstallCheck

     

       90
       90
       +
           '';

     

       93
       91
        
       

     

       94
       94
       -
             meta = with lib; {

     

       95
       95
       -
               homepage = "https://crates.io";

     

       96
       96
       -
               description = "Downloads your Rust project's dependencies and builds your project";

     

       97
       97
       -
               mainProgram = "cargo";

     

       98
       98
       -
               teams = [ teams.rust ];

     

       99
       99
       -
               license = [

     

       100
       100
       -
                 licenses.mit

     

       101
       101
       -
                 licenses.asl20

     

       102
       102
       -
               ];

     

       103
       103
       -
               platforms = platforms.unix;

     

       104
       104
       -
               # https://github.com/alexcrichton/nghttp2-rs/issues/2

     

       105
       105
       -
               broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform;

     

       106
       106
       -
             };

     

       107
       107
       -
           }

     

       108
       108
       -
           //

     

       109
       109
       -
             lib.optionalAttrs (stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget)

     

       110
       110
       -
               {

     

       111
       111
       -
                 HOST_PKG_CONFIG_PATH = "${pkgsBuildBuild.pkg-config}/bin/pkg-config";

     

       112
       112
       -
               }

     

       113
       113
       -
         )

     

       92
       92
       +
           meta = with lib; {

     

       93
       93
       +
             homepage = "https://crates.io";

     

       94
       94
       +
             description = "Downloads your Rust project's dependencies and builds your project";

     

       95
       95
       +
             mainProgram = "cargo";

     

       96
       96
       +
             teams = [ teams.rust ];

     

       97
       97
       +
             license = [

     

       98
       98
       +
               licenses.mit

     

       99
       99
       +
               licenses.asl20

     

       100
       100
       +
             ];

     

       101
       101
       +
             platforms = platforms.unix;

     

       102
       102
       +
             # https://github.com/alexcrichton/nghttp2-rs/issues/2

     

       103
       103
       +
             broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform;

     

       104
       104
       +
           };

     

       105
       105
       +
         }