Merge pull request #272 from symphorien/cleansource

undo #215 for nix >= 2.5

Author: Ericson2314

crate2nix/Cargo.nix

@@ -469,7 +469,7 @@ rec {
         ];
         # We can't filter paths with references in Nix 2.4
         # See https://github.com/NixOS/nix/issues/5410
-        src = if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
           then lib.cleanSourceWith { filter = sourceFilter;  src = ./.; }
           else ./.;
         authors = [

crate2nix/templates/Cargo.nix.tera

@@ -125,7 +125,7 @@ rec {
         {%- elif crate.source.LocalDirectory.path %}
         # We can't filter paths with references in Nix 2.4
         # See https://github.com/NixOS/nix/issues/5410
-        src = if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
           then lib.cleanSourceWith { filter = sourceFilter;  src = {{crate.source.LocalDirectory.path | safe}}; }
           else {{crate.source.LocalDirectory.path | safe}};
         {%- elif crate.source.Git %}

sample_projects/bin_with_git_branch_dep/Cargo.nix

@@ -96,7 +96,7 @@ rec {
         ];
         # We can't filter paths with references in Nix 2.4
         # See https://github.com/NixOS/nix/issues/5410
-        src = if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
           then lib.cleanSourceWith { filter = sourceFilter;  src = ./.; }
           else ./.;
         authors = [

sample_projects/bin_with_git_submodule_dep/Cargo.nix

@@ -239,7 +239,7 @@ rec {
         ];
         # We can't filter paths with references in Nix 2.4
         # See https://github.com/NixOS/nix/issues/5410
-        src = if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
           then lib.cleanSourceWith { filter = sourceFilter;  src = ./.; }
           else ./.;
         authors = [

sample_projects/codegen/Cargo.nix

@@ -223,7 +223,7 @@ rec {
         ];
         # We can't filter paths with references in Nix 2.4
         # See https://github.com/NixOS/nix/issues/5410
-        src = if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
           then lib.cleanSourceWith { filter = sourceFilter;  src = ./.; }
           else ./.;
         authors = [

sample_projects/sub_dir_crates/Cargo.nix

@@ -126,7 +126,7 @@ rec {
         ];
         # We can't filter paths with references in Nix 2.4
         # See https://github.com/NixOS/nix/issues/5410
-        src = if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
           then lib.cleanSourceWith { filter = sourceFilter;  src = ./.; }
           else ./.;
         authors = [