fetchers: Drop fetchFromLegacy

It's been upstreamed to nixpkgs in NixOS/nixpkgs#266853
nix-community · Feb 17, 2024 · ef61ffc · ef61ffc
1 parent 4e0c84f
commit ef61ffc
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 281 deletions.
diff --git a/default.nix b/default.nix
@@ -1,5 +1,4 @@
-{ pkgs, lib }:
+{ lib }:
 {
   lib = import ./lib { inherit lib; };
-  fetchers = pkgs.callPackage ./fetchers { };
 }
diff --git a/doc/src/SUMMARY.md b/doc/src/SUMMARY.md
@@ -14,7 +14,6 @@
   - [project](./lib/project.nix)
   - [renderers](./lib/renderers.nix)
   - [validators](./lib/validators.nix)
-  - [fetchers](./fetchers/default.nix)
 - [Standards APIs](./reference.md)
   - [pep440](./lib/pep440.nix)
   - [pep508](./lib/pep508.nix)

diff --git a/doc/src/fetchers b/doc/src/fetchers
diff --git a/fetchers/default.nix b/fetchers/default.nix
diff --git a/fetchers/fetch-from-legacy.py b/fetchers/fetch-from-legacy.py
diff --git a/flake-module.nix b/flake-module.nix
diff --git a/flake.nix b/flake.nix
@@ -40,7 +40,6 @@
           inputs.treefmt-nix.flakeModule
           inputs.flake-root.flakeModule
           inputs.proc-flake.flakeModule
-          ./flake-module.nix
         ];
 
         flake.githubActions = nix-github-actions.lib.mkGithubMatrix {
@@ -79,18 +78,10 @@
           {
             treefmt.imports = [ ./dev/treefmt.nix ];
 
-            checks = pkgs.callPackages ./test
-              {
-                pyproject = import ./default.nix { inherit pkgs lib; };
-              } // self.packages.${system} // {
-              mypy = pkgs.runCommand "pyproject.nix-mypy" { nativeBuildInputs = [ pkgs.python3.pkgs.mypy ]; } ''
-                mypy --exclude doc --strict ${self}
-                touch $out
-              '';
+            checks = pkgs.callPackages ./test {
+              pyproject = import ./default.nix { inherit lib; };
             };
 
-            fetchers = pkgs.callPackage ./fetchers { };
-
             proc.groups.run.processes = {
               nix-unittest.command = "${lib.getExe' pkgs.reflex "reflex"} -r '\.(nix)$' -- ${lib.getExe' pkgs.nix-unit "nix-unit"} --quiet --flake '.#libTests'";
               mdbook.command = "(cd doc && mdbook serve)";
@@ -102,6 +93,7 @@
                 config.proc.groups.run.package
                 pkgs.nix-unit
                 inputs.mdbook-nixdoc.packages.${system}.default
+                (pkgs.python3.withPackages (_ps: [ ]))
               ] ++ self.packages.${system}.doc.nativeBuildInputs;
             };
 

diff --git a/test/default.nix b/test/default.nix
@@ -80,7 +80,7 @@ lib.mapAttrs'
     }
   )
   projects
-// (
+  // (
   lib.mapAttrs'
     (
       n: project: {
@@ -113,20 +113,3 @@ lib.mapAttrs'
     )
     projects
 )
-  //
-  # Test fetchFromLegacy
-lib.mapAttrs'
-  (
-    n: args: {
-      name = "fetchers_fetchFromLegacy-${n}";
-      value = pyproject.fetchers.fetchFromLegacy args;
-    }
-  )
-  {
-    urllib3 = {
-      file = "urllib3-1.26.2.tar.gz";
-      hash = "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
-      pname = "urllib3";
-      url = "https://pypi.org/simple";
-    };
-  }