commit 8e5ab6e7ac582d2787ba2e10eabbcacf09da270c · pyrox.dev/nixpkgs

+33 -2

doc/languages-frameworks/rust.md

···

       58
       58
        
       

     

       59
       59
        
       ## Compiling Rust crates using Nix instead of Cargo

     

       60
       60
        
       

     

       61
       61
       +
       ### Simple operation

     

       62
       62
       +
       

     

       61
       63
        
       When run, `cargo build` produces a file called `Cargo.lock`,

     

       62
       64
        
       containing pinned versions of all dependencies. Nixpkgs contains a

     

       63
       65
        
       tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used

     
···

       153
       155
        
       will fetch it from [crates.io](https://crates.io). A `sha256`

     

       154
       156
        
       attribute is still needed for Nix purity.

     

       155
       157
        
       

     

       158
       158
       +
       ### Handling external dependencies

     

       159
       159
       +
       

     

       156
       160
        
       Some crates require external libraries. For crates from

     

       157
       161
        
       [crates.io](https://crates.io), such libraries can be specified in

     

       158
       162
        
       `defaultCrateOverrides` package in nixpkgs itself.

     
···

       210
       214
        
       }

     

       211
       215
        
       ```

     

       212
       216
        
       

     

       213
       213
       -
       Three more parameters can be overridden:

     

       217
       217
       +
       ### Options and phases configuration

     

       218
       218
       +
       

     

       219
       219
       +
       Actually, the overrides introduced in the previous section are more

     

       220
       220
       +
       general. A number of other parameters can be overridden:

     

       214
       221
        
       

     

       215
       222
        
       - The version of rustc used to compile the crate:

     

       216
       223
        
       

     
···

       232
       239
        
         (hello {}).override { verbose = false; };

     

       233
       240
        
         ```

     

       234
       241
        
       

     

       242
       242
       +
       - Extra arguments to be passed to `rustc`:

     

       243
       243
       +
       

     

       244
       244
       +
         ```

     

       245
       245
       +
         (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; };

     

       246
       246
       +
         ```

     

       247
       247
       +
       

     

       248
       248
       +
       - Phases, just like in any other derivation, can be specified using

     

       249
       249
       +
         the following attributes: `preUnpack`, `postUnpack`, `prePatch`,

     

       250
       250
       +
         `patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,

     

       251
       251
       +
         this is run before calling the "build" script), `postConfigure`

     

       252
       252
       +
         (after the "build" script),`preBuild`, `postBuild`, `preInstall` and

     

       253
       253
       +
         `postInstall`. As an example, here is how to create a new module

     

       254
       254
       +
         before running the build script:

     

       255
       255
       +
       

     

       256
       256
       +
         ```

     

       257
       257
       +
         (hello {}).override {

     

       258
       258
       +
           preConfigure = ''

     

       259
       259
       +
              echo "pub const PATH=\"${hi.out}\";" >> src/path.rs"

     

       260
       260
       +
           '';

     

       261
       261
       +
         };

     

       262
       262
       +
         ```

     

       263
       263
       +
       

     

       264
       264
       +
       ### Features

     

       265
       265
       +
       

     

       235
       266
        
       One can also supply features switches. For example, if we want to

     

       236
       267
        
       compile `diesel_cli` only with the `postgres` feature, and no default

     

       237
       268
        
       features, we would write:

     
···

       243
       274
        
       }

     

       244
       275
        
       ```

     

       245
       276
        
       

     

       246
       246
       -
       

     

       277
       277
       +
       Where `diesel.nix` is the file generated by Carnix, as explained above.

     

       247
       278
        
       

     

       248
       279
        
       ## Using the Rust nightlies overlay

     

       249
       280

+179 -115

pkgs/build-support/rust/build-rust-crate.nix

···

       6
       6
        
       

     

       7
       7
        
       { lib, buildPlatform, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc  }:

     

       8
       8
        
       

     

       9
       9
       -
       let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies,

     

       10
       10
       -
                          dependencies, completeDeps, completeBuildDeps,

     

       11
       11
       -
                          crateFeatures, libName, build, release, libPath,

     

       12
       12
       -
                          crateType, metadata, crateBin, finalBins,

     

       13
       13
       -
                          verbose, colors }:

     

       14
       14
       -
       

     

       15
       15
       -
             let depsDir = lib.concatStringsSep " " dependencies;

     

       16
       16
       -
                 completeDepsDir = lib.concatStringsSep " " completeDeps;

     

       17
       17
       -
                 completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;

     

       18
       18
       -
                 makeDeps = dependencies:

     

       19
       19
       -
                   (lib.concatMapStringsSep " " (dep:

     

       20
       20
       -
                     let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in

     

       21
       21
       -
                     (if dep.crateType == "lib" then

     

       22
       22
       -
                        " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"

     

       23
       23
       -
                     else

     

       24
       24
       -
                        " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}")

     

       25
       25
       -
                   ) dependencies);

     

       26
       26
       -
                 deps = makeDeps dependencies;

     

       27
       27
       -
                 buildDeps = makeDeps buildDependencies;

     

       28
       28
       -
                 optLevel = if release then 3 else 0;

     

       29
       29
       -
                 rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2");

     

       30
       30
       -
                 rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";

     

       31
       31
       -
                 version_ = lib.splitString "-" crateVersion;

     

       32
       32
       -
                 versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;

     

       33
       33
       -
                 version = lib.splitString "." (lib.head version_);

     

       34
       34
       -
                 authors = lib.concatStringsSep ":" crateAuthors;

     

       35
       35
       -
             in ''

     

       36
       36
       -
             norm=""

     

       37
       37
       -
             bold=""

     

       38
       38
       -
             green=""

     

       39
       39
       -
             boldgreen=""

     

       40
       40
       -
             if [[ "${colors}" -eq "always" ]]; then

     

       41
       41
       -
               norm="$(printf '\033[0m')" #returns to "normal"

     

       42
       42
       -
               bold="$(printf '\033[0;1m')" #set bold

     

       43
       43
       -
               green="$(printf '\033[0;32m')" #set green

     

       44
       44
       -
               boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green.

     

       45
       45
       -
             fi

     

       9
       9
       +
       let makeDeps = dependencies:

     

       10
       10
       +
             (lib.concatMapStringsSep " " (dep:

     

       11
       11
       +
               let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in

     

       12
       12
       +
               (if dep.crateType == "lib" then

     

       13
       13
       +
                  " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"

     

       14
       14
       +
                else

     

       15
       15
       +
                  " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${buildPlatform.extensions.sharedLibrary}")

     

       16
       16
       +
             ) dependencies);

     

       46
       17
        
       

     

       18
       18
       +
           echo_build_heading = colors: ''

     

       47
       19
        
             echo_build_heading() {

     

       48
       20
        
              start=""

     

       49
       21
        
              end=""

     
···

       57
       29
        
                echo "$start""Building $1 ($2)""$end"

     

       58
       30
        
              fi

     

       59
       31
        
             }

     

       60
       60
       -
       

     

       32
       32
       +
           '';

     

       33
       33
       +
           noisily = colors: verbose: ''

     

       61
       34
        
             noisily() {

     

       62
       35
        
               start=""

     

       63
       36
        
               end=""

     
···

       71
       44
        
       	''}

     

       72
       45
        
       	$@

     

       73
       46
        
             }

     

       47
       47
       +
           '';

     

       74
       48
        
       

     

       49
       49
       +
           configureCrate =

     

       50
       50
       +
             { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies }:

     

       51
       51
       +
             let version_ = lib.splitString "-" crateVersion;

     

       52
       52
       +
                 versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;

     

       53
       53
       +
                 version = lib.splitString "." (lib.head version_);

     

       54
       54
       +
                 rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2");

     

       55
       55
       +
                 buildDeps = makeDeps buildDependencies;

     

       56
       56
       +
                 authors = lib.concatStringsSep ":" crateAuthors;

     

       57
       57
       +
                 optLevel = if release then 3 else 0;

     

       58
       58
       +
                 completeDepsDir = lib.concatStringsSep " " completeDeps;

     

       59
       59
       +
                 completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;

     

       60
       60
       +
             in ''

     

       61
       61
       +
             runHook preConfigure

     

       62
       62
       +
             ${echo_build_heading colors}

     

       63
       63
       +
             ${noisily colors verbose}

     

       75
       64
        
             symlink_dependency() {

     

       76
       76
       -
             # $1 is the nix-store path of a dependency

     

       65
       65
       +
               # $1 is the nix-store path of a dependency

     

       66
       66
       +
               # $2 is the target path

     

       77
       67
        
               i=$1

     

       78
       78
       -
       	dest=target/deps

     

       79
       79
       -
       	if [ ! -z $2 ]; then

     

       80
       80
       -
                  if [ "$2" = "--buildDep" ]; then

     

       81
       81
       -
                    dest=target/buildDeps

     

       82
       82
       -
                  fi

     

       83
       83
       -
       	fi

     

       84
       84
       -
               ln -s -f $i/lib/*.rlib $dest #*/

     

       85
       85
       -
               ln -s -f $i/lib/*.so $i/lib/*.dylib $dest #*/

     

       68
       68
       +
               ln -s -f $i/lib/*.rlib $2 #*/

     

       69
       69
       +
               ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/

     

       86
       70
        
               if [ -e "$i/lib/link" ]; then

     

       87
       71
        
                   cat $i/lib/link >> target/link

     

       88
       72
        
                   cat $i/lib/link >> target/link.final

     
···

       92
       76
        
               fi

     

       93
       77
        
             }

     

       94
       78
        
       

     

       95
       95
       -
             build_lib() {

     

       96
       96
       -
                lib_src=$1

     

       97
       97
       -
                echo_build_heading $lib_src ${libName}

     

       98
       98
       -
       

     

       99
       99
       -
                noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \

     

       100
       100
       -
                  ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \

     

       101
       101
       -
                  --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \

     

       102
       102
       -
                  $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}

     

       103
       103
       -
       

     

       104
       104
       -
                EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib"

     

       105
       105
       -
                if [ -e target/deps/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary} ]; then

     

       106
       106
       -
                   EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary}"

     

       107
       107
       -
                fi

     

       108
       108
       -
             }

     

       109
       109
       -
       

     

       110
       110
       -
             build_bin() {

     

       111
       111
       -
               crate_name=$1

     

       112
       112
       -
               crate_name_=$(echo $crate_name | sed -e "s/-/_/g")

     

       113
       113
       -
       	main_file=""

     

       114
       114
       -
       	if [[ ! -z $2 ]]; then

     

       115
       115
       -
                 main_file=$2

     

       116
       116
       -
       	fi

     

       117
       117
       -
       	echo_build_heading $@

     

       118
       118
       -
       	noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\

     

       119
       119
       -
                 ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \

     

       120
       120
       -
                 $LINK ${deps}$EXTRA_LIB --cap-lints allow \

     

       121
       121
       -
                 $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}

     

       122
       122
       -
               if [ "$crate_name_" -ne "$crate_name" ]; then

     

       123
       123
       -
                 mv target/bin/$crate_name_ target/bin/$crate_name

     

       124
       124
       -
               fi

     

       125
       125
       -
             }

     

       126
       126
       -
       

     

       127
       127
       -
             runHook preBuild

     

       128
       79
        
             mkdir -p target/{deps,lib,build,buildDeps}

     

       129
       80
        
             chmod uga+w target -R

     

       130
       81
        
             for i in ${completeDepsDir}; do

     

       131
       131
       -
               symlink_dependency $i

     

       82
       82
       +
               symlink_dependency $i target/deps

     

       132
       83
        
             done

     

       133
       84
        
             for i in ${completeBuildDepsDir}; do

     

       134
       134
       -
                symlink_dependency $i --buildDep

     

       85
       85
       +
                symlink_dependency $i target/buildDeps

     

       135
       86
        
             done

     

       136
       136
       -
             if [ -e target/link ]; then

     

       87
       87
       +
             if [[ -e target/link ]]; then

     

       137
       88
        
               sort -u target/link > target/link.sorted

     

       138
       89
        
               mv target/link.sorted target/link

     

       139
       90
        
               sort -u target/link.final > target/link.final.sorted

     
···

       145
       96
        
             export CARGO_PKG_NAME=${crateName}

     

       146
       97
        
             export CARGO_PKG_VERSION=${crateVersion}

     

       147
       98
        
             export CARGO_PKG_AUTHORS="${authors}"

     

       99
       99
       +
       

     

       148
       100
        
             export CARGO_CFG_TARGET_ARCH=${buildPlatform.parsed.cpu.name}

     

       149
       101
        
             export CARGO_CFG_TARGET_OS=${buildPlatform.parsed.kernel.name}

     

       150
       150
       -
       

     

       102
       102
       +
             export CARGO_CFG_TARGET_FAMILY="unix"

     

       103
       103
       +
             export CARGO_CFG_UNIX=1

     

       151
       104
        
             export CARGO_CFG_TARGET_ENV="gnu"

     

       105
       105
       +
             export CARGO_CFG_TARGET_ENDIAN=${if buildPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"}

     

       106
       106
       +
             export CARGO_CFG_TARGET_POINTER_WIDTH=${toString buildPlatform.parsed.cpu.bits}

     

       107
       107
       +
             export CARGO_CFG_TARGET_VENDOR=${buildPlatform.parsed.vendor.name}

     

       108
       108
       +
       

     

       152
       109
        
             export CARGO_MANIFEST_DIR="."

     

       153
       110
        
             export DEBUG="${toString (!release)}"

     

       154
       111
        
             export OPT_LEVEL="${toString optLevel}"

     
···

       159
       116
        
             export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}

     

       160
       117
        
             export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}

     

       161
       118
        
             export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}

     

       162
       162
       -
             if [ -n "${versionPre}" ]; then

     

       119
       119
       +
             if [[ -n "${versionPre}" ]]; then

     

       163
       120
        
               export CARGO_PKG_VERSION_PRE="${versionPre}"

     

       164
       121
        
             fi

     

       165
       122
        
       

     
···

       180
       137
        
                  EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)"

     

       181
       138
        
                fi

     

       182
       139
        
                noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \

     

       183
       183
       -
                 ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \

     

       184
       184
       -
                 -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}

     

       140
       140
       +
                  ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \

     

       141
       141
       +
                  -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}

     

       185
       142
        
       

     

       186
       143
        
                mkdir -p target/build/${crateName}.out

     

       187
       144
        
                export RUST_BACKTRACE=1

     
···

       198
       155
        
                  | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env

     

       199
       156
        
       

     

       200
       157
        
                set -e

     

       201
       201
       -
                if [ -n "$(ls target/build/${crateName}.out)" ]; then

     

       158
       158
       +
                if [[ -n "$(ls target/build/${crateName}.out)" ]]; then

     

       202
       159
        
       

     

       203
       203
       -
                   if [ -e "${libPath}" ] ; then

     

       160
       160
       +
                   if [[ -e "${libPath}" ]]; then

     

       204
       161
        
                      cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/

     

       205
       162
        
                   else

     

       206
       163
        
                      cp -r target/build/${crateName}.out/* src #*/

     

       207
       164
        
                   fi

     

       208
       165
        
                fi

     

       209
       166
        
             fi

     

       167
       167
       +
             runHook postConfigure

     

       168
       168
       +
           '';

     

       169
       169
       +
       

     

       170
       170
       +
           buildCrate = { crateName, crateVersion, crateAuthors,

     

       171
       171
       +
                          dependencies, completeDeps, completeBuildDeps,

     

       172
       172
       +
                          crateFeatures, libName, build, release, libPath,

     

       173
       173
       +
                          crateType, metadata, crateBin, finalBins,

     

       174
       174
       +
                          extraRustcOpts,

     

       175
       175
       +
                          verbose, colors }:

     

       176
       176
       +
       

     

       177
       177
       +
             let depsDir = lib.concatStringsSep " " dependencies;

     

       178
       178
       +
                 completeDepsDir = lib.concatStringsSep " " completeDeps;

     

       179
       179
       +
                 completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;

     

       180
       180
       +
                 deps = makeDeps dependencies;

     

       181
       181
       +
                 optLevel = if release then 3 else 0;

     

       182
       182
       +
                 rustcOpts =

     

       183
       183
       +
                   lib.lists.foldl' (opts: opt: opts + " " + opt)

     

       184
       184
       +
                     (if release then "-C opt-level=3" else "-C debuginfo=2")

     

       185
       185
       +
                     extraRustcOpts;

     

       186
       186
       +
                 rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";

     

       187
       187
       +
                 version_ = lib.splitString "-" crateVersion;

     

       188
       188
       +
                 versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;

     

       189
       189
       +
                 version = lib.splitString "." (lib.head version_);

     

       190
       190
       +
                 authors = lib.concatStringsSep ":" crateAuthors;

     

       191
       191
       +
             in ''

     

       192
       192
       +
             runHook preBuild

     

       193
       193
       +
             norm=""

     

       194
       194
       +
             bold=""

     

       195
       195
       +
             green=""

     

       196
       196
       +
             boldgreen=""

     

       197
       197
       +
             if [[ "${colors}" -eq "always" ]]; then

     

       198
       198
       +
               norm="$(printf '\033[0m')" #returns to "normal"

     

       199
       199
       +
               bold="$(printf '\033[0;1m')" #set bold

     

       200
       200
       +
               green="$(printf '\033[0;32m')" #set green

     

       201
       201
       +
               boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green.

     

       202
       202
       +
             fi

     

       203
       203
       +
             ${echo_build_heading colors}

     

       204
       204
       +
             ${noisily colors verbose}

     

       205
       205
       +
       

     

       206
       206
       +
             build_lib() {

     

       207
       207
       +
                lib_src=$1

     

       208
       208
       +
                echo_build_heading $lib_src ${libName}

     

       209
       209
       +
       

     

       210
       210
       +
                noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \

     

       211
       211
       +
                  ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \

     

       212
       212
       +
                  --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \

     

       213
       213
       +
                  $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}

     

       214
       214
       +
       

     

       215
       215
       +
                EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib"

     

       216
       216
       +
                if [ -e target/deps/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary} ]; then

     

       217
       217
       +
                   EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${buildPlatform.extensions.sharedLibrary}"

     

       218
       218
       +
                fi

     

       219
       219
       +
             }

     

       220
       220
       +
       

     

       221
       221
       +
             build_bin() {

     

       222
       222
       +
               crate_name=$1

     

       223
       223
       +
               crate_name_=$(echo $crate_name | sed -e "s/-/_/g")

     

       224
       224
       +
       	main_file=""

     

       225
       225
       +
       	if [[ ! -z $2 ]]; then

     

       226
       226
       +
                 main_file=$2

     

       227
       227
       +
       	fi

     

       228
       228
       +
       	echo_build_heading $@

     

       229
       229
       +
       	noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\

     

       230
       230
       +
                 ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \

     

       231
       231
       +
                 $LINK ${deps}$EXTRA_LIB --cap-lints allow \

     

       232
       232
       +
                 $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}

     

       233
       233
       +
               if [ "$crate_name_" -ne "$crate_name" ]; then

     

       234
       234
       +
                 mv target/bin/$crate_name_ target/bin/$crate_name

     

       235
       235
       +
               fi

     

       236
       236
       +
             }

     

       237
       237
       +
       

     

       210
       238
        
       

     

       211
       239
        
             EXTRA_LIB=""

     

       212
       240
        
             CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g")

     

       213
       241
        
       

     

       214
       214
       -
             if [ -e target/link_ ]; then

     

       242
       242
       +
             if [[ -e target/link_ ]]; then

     

       215
       243
        
               EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD"

     

       216
       244
        
             fi

     

       217
       245
        
       

     

       218
       218
       -
             if [ -e "${libPath}" ] ; then

     

       246
       246
       +
             if [[ -e "${libPath}" ]]; then

     

       219
       247
        
                build_lib ${libPath}

     

       220
       220
       -
             elif [ -e src/lib.rs ] ; then

     

       248
       248
       +
             elif [[ -e src/lib.rs ]]; then

     

       221
       249
        
                build_lib src/lib.rs

     

       222
       222
       -
             elif [ -e src/${libName}.rs ] ; then

     

       250
       250
       +
             elif [[ -e src/${libName}.rs ]]; then

     

       223
       251
        
                build_lib src/${libName}.rs

     

       224
       252
        
             fi

     

       225
       253
        
       

     

       226
       254
        
             echo "$EXTRA_LINK_SEARCH" | while read i; do

     

       227
       227
       -
                if [ ! -z "$i" ]; then

     

       255
       255
       +
                if [[ ! -z "$i" ]]; then

     

       228
       256
        
                  for lib in $i; do

     

       229
       257
        
                    echo "-L $lib" >> target/link

     

       230
       258
        
                    L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#")

     
···

       233
       261
        
                fi

     

       234
       262
        
             done

     

       235
       263
        
             echo "$EXTRA_LINK" | while read i; do

     

       236
       236
       -
                if [ ! -z "$i" ]; then

     

       264
       264
       +
                if [[ ! -z "$i" ]]; then

     

       237
       265
        
                  for lib in $i; do

     

       238
       266
        
                    echo "-l $lib" >> target/link

     

       239
       267
        
                    echo "-l $lib" >> target/link.final

     
···

       241
       269
        
                fi

     

       242
       270
        
             done

     

       243
       271
        
       

     

       244
       244
       -
             if [ -e target/link ]; then

     

       272
       272
       +
             if [[ -e target/link ]]; then

     

       245
       273
        
                sort -u target/link.final > target/link.final.sorted

     

       246
       274
        
                mv target/link.final.sorted target/link.final

     

       247
       275
        
                sort -u target/link > target/link.sorted

     
···

       253
       281
        
       

     

       254
       282
        
             mkdir -p target/bin

     

       255
       283
        
             echo "${crateBin}" | sed -n 1'p' | tr ',' '\n' | while read BIN; do

     

       256
       256
       -
                if [ ! -z "$BIN" ]; then

     

       284
       284
       +
                if [[ ! -z "$BIN" ]]; then

     

       257
       285
        
                  build_bin $BIN

     

       258
       286
        
                fi

     

       259
       287
        
             done

     
···

       267
       295
        
             ''}

     

       268
       296
        
             # Remove object files to avoid "wrong ELF type"

     

       269
       297
        
             find target -type f -name "*.o" -print0 | xargs -0 rm -f

     

       298
       298
       +
           '' + finalBins + ''

     

       270
       299
        
             runHook postBuild

     

       271
       271
       -
           '' + finalBins;

     

       300
       300
       +
           '';

     

       272
       301
        
       

     

       273
       273
       -
           installCrate = crateName: ''

     

       302
       302
       +
           installCrate = crateName: metadata: ''

     

       303
       303
       +
             runHook preInstall

     

       274
       304
        
             mkdir -p $out

     

       275
       275
       -
             if [ -s target/env ]; then

     

       305
       305
       +
             if [[ -s target/env ]]; then

     

       276
       306
        
               cp target/env $out/env

     

       277
       307
        
             fi

     

       278
       278
       -
             if [ -s target/link.final ]; then

     

       308
       308
       +
             if [[ -s target/link.final ]]; then

     

       279
       309
        
               mkdir -p $out/lib

     

       280
       310
        
               cp target/link.final $out/lib/link

     

       281
       311
        
             fi

     

       282
       282
       -
             if [ "$(ls -A target/lib)" ]; then

     

       312
       312
       +
             if [[ "$(ls -A target/lib)" ]]; then

     

       283
       313
        
               mkdir -p $out/lib

     

       284
       314
        
               cp target/lib/* $out/lib #*/

     

       315
       315
       +
               for lib in $out/lib/*.so $out/lib/*.dylib; do #*/

     

       316
       316
       +
                 ln -s $lib $(echo $lib | sed -e "s/-${metadata}//")

     

       317
       317
       +
               done

     

       285
       318
        
             fi

     

       286
       286
       -
             if [ "$(ls -A target/build)" ]; then # */

     

       319
       319
       +
             if [[ "$(ls -A target/build)" ]]; then # */

     

       287
       320
        
               mkdir -p $out/lib

     

       288
       321
        
               cp -r target/build/* $out/lib # */

     

       289
       322
        
             fi

     

       290
       290
       -
             if [ "$(ls -A target/bin)" ]; then

     

       323
       323
       +
             if [[ "$(ls -A target/bin)" ]]; then

     

       291
       324
        
               mkdir -p $out/bin

     

       292
       325
        
               cp -P target/bin/* $out/bin # */

     

       293
       326
        
             fi

     
···

       295
       328
        
           '';

     

       296
       329
        
       in

     

       297
       330
        
       

     

       298
       298
       -
       crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides }:

     

       331
       331
       +
       crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,

     

       332
       332
       +
         dependencies, buildDependencies,

     

       333
       333
       +
         extraRustcOpts,

     

       334
       334
       +
         preUnpack, postUnpack, prePatch, patches, postPatch,

     

       335
       335
       +
         preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:

     

       299
       336
        
       

     

       300
       337
        
       let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);

     

       338
       338
       +
           release_ = release;

     

       339
       339
       +
           dependencies_ = dependencies;

     

       340
       340
       +
           buildDependencies_ = buildDependencies;

     

       301
       341
        
           processedAttrs = [

     

       302
       342
        
             "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"

     

       303
       343
        
             "buildDependencies" "dependencies" "features"

     
···

       309
       349
        
       stdenv.mkDerivation (rec {

     

       310
       350
        
       

     

       311
       351
        
           inherit (crate) crateName;

     

       352
       352
       +
           inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall;

     

       312
       353
        
       

     

       313
       354
        
           src = if lib.hasAttr "src" crate then

     

       314
       355
        
               crate.src

     
···

       319
       360
        
           dependencies =

     

       320
       361
        
             builtins.map

     

       321
       362
        
               (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })

     

       322
       322
       -
               (crate.dependencies or []);

     

       363
       363
       +
               dependencies_;

     

       323
       364
        
       

     

       324
       365
        
           buildDependencies =

     

       325
       366
        
             builtins.map

     

       326
       367
        
               (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })

     

       327
       327
       -
               (crate.buildDependencies or []);

     

       368
       368
       +
               buildDependencies_;

     

       328
       369
        
       

     

       329
       370
        
           completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies);

     

       330
       371
        
           completeBuildDeps = lib.lists.unique (

     
···

       339
       380
        
           libName = if crate ? libName then crate.libName else crate.crateName;

     

       340
       381
        
           libPath = if crate ? libPath then crate.libPath else "";

     

       341
       382
        
       

     

       342
       342
       -
           metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion));

     

       383
       383
       +
           depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies);

     

       384
       384
       +
           metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata ));

     

       343
       385
        
       

     

       344
       386
        
           crateBin = if crate ? crateBin then

     

       345
       387
        
              builtins.foldl' (bins: bin:

     
···

       370
       412
        
           crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];

     

       371
       413
        
           crateType =

     

       372
       414
        
             if lib.attrByPath ["procMacro"] false crate then "proc-macro" else

     

       373
       373
       -
             if lib.attrByPath ["plugin"] false crate then "dylib" else "lib";

     

       415
       415
       +
             if lib.attrByPath ["plugin"] false crate then "dylib" else

     

       416
       416
       +
             if crate ? type then crate.type else "lib";

     

       374
       417
        
           colors = lib.attrByPath [ "colors" ] "always" crate;

     

       375
       375
       -
           buildPhase = buildCrate {

     

       418
       418
       +
           configurePhase = configureCrate {

     

       376
       419
        
             inherit crateName dependencies buildDependencies completeDeps completeBuildDeps

     

       420
       420
       +
                     crateFeatures libName build release libPath crateVersion

     

       421
       421
       +
                     crateAuthors verbose colors;

     

       422
       422
       +
           };

     

       423
       423
       +
           extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];

     

       424
       424
       +
           buildPhase = buildCrate {

     

       425
       425
       +
             inherit crateName dependencies completeDeps completeBuildDeps

     

       377
       426
        
                     crateFeatures libName build release libPath crateType crateVersion

     

       378
       378
       -
                     crateAuthors metadata crateBin finalBins verbose colors;

     

       427
       427
       +
                     crateAuthors metadata crateBin finalBins verbose colors extraRustcOpts;

     

       379
       428
        
           };

     

       380
       380
       -
           installPhase = installCrate crateName;

     

       429
       429
       +
           installPhase = installCrate crateName metadata;

     

       381
       430
        
       

     

       382
       382
       -
       } // extraDerivationAttrs)) {

     

       431
       431
       +
       } // extraDerivationAttrs

     

       432
       432
       +
       )) {

     

       383
       433
        
         rust = rustc;

     

       384
       384
       -
         release = true;

     

       385
       385
       -
         verbose = true;

     

       434
       434
       +
         release = crate_.release or true;

     

       435
       435
       +
         verbose = crate_.verbose or true;

     

       436
       436
       +
         extraRustcOpts = [];

     

       386
       437
        
         features = [];

     

       387
       438
        
         buildInputs = [];

     

       388
       439
        
         crateOverrides = defaultCrateOverrides;

     

       440
       440
       +
         preUnpack = crate_.preUnpack or "";

     

       441
       441
       +
         postUnpack = crate_.postUnpack or "";

     

       442
       442
       +
         prePatch = crate_.prePatch or "";

     

       443
       443
       +
         patches = crate_.patches or [];

     

       444
       444
       +
         postPatch = crate_.postPatch or "";

     

       445
       445
       +
         preConfigure = crate_.preConfigure or "";

     

       446
       446
       +
         postConfigure = crate_.postConfigure or "";

     

       447
       447
       +
         preBuild = crate_.preBuild or "";

     

       448
       448
       +
         postBuild = crate_.postBuild or "";

     

       449
       449
       +
         preInstall = crate_.preInstall or "";

     

       450
       450
       +
         postInstall = crate_.postInstall or "";

     

       451
       451
       +
         dependencies = crate_.dependencies or [];

     

       452
       452
       +
         buildDependencies = crate_.buildDependencies or [];

     

       389
       453
        
       }

+8 -8

pkgs/build-support/rust/carnix.nix

···

       1
       1
       -
       # Generated by carnix 0.6.5: carnix -o carnix.nix Cargo.lock --src ./.

     

       1
       1
       +
       # Generated by carnix 0.6.5: carnix -o carnix.nix Cargo.lock

     

       2
       2
        
       { lib, buildPlatform, buildRustCrate, fetchgit }:

     

       3
       3
        
       let kernel = buildPlatform.parsed.kernel.name;

     

       4
       4
        
           abi = buildPlatform.parsed.abi.name;

     
···

       18
       18
        
           ) [] (builtins.attrNames feat);

     

       19
       19
        
       in

     

       20
       20
        
       rec {

     

       21
       21
       -
         carnix = f: carnix_0_6_5 { features = carnix_0_6_5_features { carnix_0_6_5 = f; }; };

     

       21
       21
       +
         carnix = f: carnix_0_6_6 { features = carnix_0_6_6_features { carnix_0_6_6 = f; }; };

     

       22
       22
        
         aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {

     

       23
       23
        
           crateName = "aho-corasick";

     

       24
       24
        
           version = "0.6.3";

     
···

       71
       71
        
           sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1";

     

       72
       72
        
           inherit dependencies buildDependencies features;

     

       73
       73
        
         };

     

       74
       74
       -
         carnix_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {

     

       74
       74
       +
         carnix_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {

     

       75
       75
        
           crateName = "carnix";

     

       76
       76
       -
           version = "0.6.5";

     

       76
       76
       +
           version = "0.6.6";

     

       77
       77
        
           authors = [ "pe@pijul.org <pe@pijul.org>" ];

     

       78
       78
       -
           sha256 = "0r952s5az5mhw7z2r421i5lr0w5h436hah61md2bdb3204c2pl9c";

     

       78
       78
       +
           sha256 = "1ai2r52j6vlrclhb7cvifx3lsg9naiy3jpsrbi3mmfmr6zbi7rdw";

     

       79
       79
        
           inherit dependencies buildDependencies features;

     

       80
       80
        
         };

     

       81
       81
        
         cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {

     
···

       623
       623
        
             (f.bitflags_1_0_1.default or false) ||

     

       624
       624
        
             (bitflags_1_0_1.default or false);

     

       625
       625
        
         }) [];

     

       626
       626
       -
         carnix_0_6_5 = { features?(carnix_0_6_5_features {}) }: carnix_0_6_5_ {

     

       626
       626
       +
         carnix_0_6_6 = { features?(carnix_0_6_6_features {}) }: carnix_0_6_6_ {

     

       627
       627
        
           dependencies = mapFeatures features ([ clap_2_28_0 env_logger_0_5_3 error_chain_0_11_0 itertools_0_7_3 log_0_4_1 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]);

     

       628
       628
        
         };

     

       629
       629
       -
         carnix_0_6_5_features = f: updateFeatures f (rec {

     

       630
       630
       -
           carnix_0_6_5.default = (f.carnix_0_6_5.default or true);

     

       629
       629
       +
         carnix_0_6_6_features = f: updateFeatures f (rec {

     

       630
       630
       +
           carnix_0_6_6.default = (f.carnix_0_6_6.default or true);

     

       631
       631
        
           clap_2_28_0.default = true;

     

       632
       632
        
           env_logger_0_5_3.default = true;

     

       633
       633
        
           error_chain_0_11_0.default = true;