File tree Expand file tree Collapse file tree 5 files changed +5
-25
lines changed
bin_with_git_submodule_dep Expand file tree Collapse file tree 5 files changed +5
-25
lines changed Original file line number Diff line number Diff line change @@ -470,11 +470,7 @@ rec {
470
470
requiredFeatures = [ ] ;
471
471
}
472
472
] ;
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 = ./. ; } ;
478
474
authors = [
479
475
"Peter Kolloch <info@eigenvalue.net>"
480
476
] ;
Original file line number Diff line number Diff line change @@ -128,11 +128,7 @@ rec {
128
128
{%- elif crate.source.Nix.file.package %}
129
129
src = pkgs.callPackage {{crate.source.Nix.file.package | safe}} {};
130
130
{%- 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}}; };
136
132
{%- elif crate.source.Git %}
137
133
workspace_member = null;
138
134
src = pkgs.fetchgit {
Original file line number Diff line number Diff line change @@ -121,11 +121,7 @@ rec {
121
121
requiredFeatures = [ ] ;
122
122
}
123
123
] ;
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 = ./. ; } ;
129
125
authors = [
130
126
"Phillip Cloud <cloud@standard.ai>"
131
127
] ;
Original file line number Diff line number Diff line change @@ -223,11 +223,7 @@ rec {
223
223
requiredFeatures = [ ] ;
224
224
}
225
225
] ;
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 = ./. ; } ;
231
227
authors = [
232
228
"Peter Kolloch <info@eigenvalue.net>"
233
229
] ;
Original file line number Diff line number Diff line change @@ -126,11 +126,7 @@ rec {
126
126
requiredFeatures = [ ] ;
127
127
}
128
128
] ;
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 = ./. ; } ;
134
130
authors = [
135
131
"Peter Kolloch <info@eigenvalue.net>"
136
132
] ;
You can’t perform that action at this time.
0 commit comments