Skip to content

Commit dd8003b

Browse files
committed
always filter src using filterSource
Previously it was not possible, but it is now with NixOS/nix#5494
1 parent e6797b9 commit dd8003b

File tree

5 files changed

+5
-25
lines changed

5 files changed

+5
-25
lines changed

crate2nix/Cargo.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,11 +470,7 @@ rec {
470470
requiredFeatures = [ ];
471471
}
472472
];
473-
# We can't filter paths with references in Nix 2.4
474-
# See https://github.com/NixOS/nix/issues/5410
475-
src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
476-
then lib.cleanSourceWith { filter = sourceFilter; src = ./.; }
477-
else ./.;
473+
src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
478474
authors = [
479475
"Peter Kolloch <info@eigenvalue.net>"
480476
];

crate2nix/templates/Cargo.nix.tera

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,7 @@ rec {
128128
{%- elif crate.source.Nix.file.package %}
129129
src = pkgs.callPackage {{crate.source.Nix.file.package | safe}} {};
130130
{%- elif crate.source.LocalDirectory.path %}
131-
# We can't filter paths with references in Nix 2.4
132-
# See https://github.com/NixOS/nix/issues/5410
133-
src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
134-
then lib.cleanSourceWith { filter = sourceFilter; src = {{crate.source.LocalDirectory.path | safe}}; }
135-
else {{crate.source.LocalDirectory.path | safe}};
131+
src = lib.cleanSourceWith { filter = sourceFilter; src = {{crate.source.LocalDirectory.path | safe}}; };
136132
{%- elif crate.source.Git %}
137133
workspace_member = null;
138134
src = pkgs.fetchgit {

sample_projects/bin_with_git_submodule_dep/Cargo.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ rec {
121121
requiredFeatures = [ ];
122122
}
123123
];
124-
# We can't filter paths with references in Nix 2.4
125-
# See https://github.com/NixOS/nix/issues/5410
126-
src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
127-
then lib.cleanSourceWith { filter = sourceFilter; src = ./.; }
128-
else ./.;
124+
src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
129125
authors = [
130126
"Phillip Cloud <cloud@standard.ai>"
131127
];

sample_projects/codegen/Cargo.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,7 @@ rec {
223223
requiredFeatures = [ ];
224224
}
225225
];
226-
# We can't filter paths with references in Nix 2.4
227-
# See https://github.com/NixOS/nix/issues/5410
228-
src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
229-
then lib.cleanSourceWith { filter = sourceFilter; src = ./.; }
230-
else ./.;
226+
src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
231227
authors = [
232228
"Peter Kolloch <info@eigenvalue.net>"
233229
];

sample_projects/sub_dir_crates/Cargo.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,7 @@ rec {
126126
requiredFeatures = [ ];
127127
}
128128
];
129-
# We can't filter paths with references in Nix 2.4
130-
# See https://github.com/NixOS/nix/issues/5410
131-
src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
132-
then lib.cleanSourceWith { filter = sourceFilter; src = ./.; }
133-
else ./.;
129+
src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
134130
authors = [
135131
"Peter Kolloch <info@eigenvalue.net>"
136132
];

0 commit comments

Comments
 (0)