diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-01 00:24:46 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-04-01 00:40:03 -0400 |
| commit | 4ccb74011fc77cb761a3c33ed796724795425420 (patch) | |
| tree | 91e0d95cdfe1023c3de5ff214eba58985e2d2d35 /pkgs/build-support | |
| parent | 75514175920e1613c8eaf8026b367b48f8b77027 (diff) | |
| parent | 18aa59b0f26fc707e7313f8467e67159e61600c2 (diff) | |
| download | nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.gz nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.bz2 nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.lz nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.xz nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.tar.zst nixpkgs-4ccb74011fc77cb761a3c33ed796724795425420.zip | |
Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging
There was one conflict in the NixOS manual; I checked that it still built after resolving it.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/helpers.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix index 8a0a62434ec..14d997b2d5c 100644 --- a/pkgs/build-support/rust/build-rust-crate/helpers.nix +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -14,9 +14,8 @@ include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); - suff = lib.strings.removePrefix p path; in - suff == "" || (lib.strings.hasPrefix "/" suff) + p == path || (lib.strings.hasPrefix (p + "/") path) ) includedFiles ) src; exclude = excludedFiles: src: builtins.filterSource (path: type: |