Merge pull request #1364 from cpcloud/unused-inputs

chore: clean up unused inputs and tests; fix statix and deadnix lints
nix-community · Oct 26, 2023 · 3b6124e · 3b6124e
2 parents 81ea18d + 65f59a4
commit 3b6124e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 50 deletions.
diff --git a/lib.nix b/lib.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, stdenv }:
+{ lib, pkgs, ... }:
 let
   inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver;
   inherit (builtins) genList length;

diff --git a/mk-poetry-dep.nix b/mk-poetry-dep.nix
@@ -44,7 +44,6 @@ pythonPackages.callPackage
           isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname;
         in
         builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files;
-      toPath = s: pwd + "/${s}";
       isLocked = lib.length fileCandidates > 0;
       isSource = source != null;
       isGit = isSource && source.type == "git";
@@ -53,7 +52,7 @@ pythonPackages.callPackage
       isDirectory = isSource && source.type == "directory";
       isFile = isSource && source.type == "file";
       isLegacy = isSource && source.type == "legacy";
-      localDepPath = toPath source.url;
+      localDepPath = pwd + "/${source.url}";
 
       buildSystemPkgs =
         let

diff --git a/templates/app/flake.nix b/templates/app/flake.nix
@@ -1,11 +1,13 @@
 {
   description = "Application packaged using poetry2nix";
 
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  inputs.poetry2nix = {
-    url = "github:nix-community/poetry2nix";
-    inputs.nixpkgs.follows = "nixpkgs";
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    poetry2nix = {
+      url = "github:nix-community/poetry2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, flake-utils, poetry2nix }:

diff --git a/tests/awscli/default.nix b/tests/awscli/default.nix
@@ -1,4 +1,4 @@
-{ poetry2nix, runCommand }:
+{ poetry2nix }:
 poetry2nix.mkPoetryApplication {
   projectDir = ./.;
 }
diff --git a/tests/bcrypt/default.nix b/tests/bcrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, poetry2nix, runCommand }:
+{ lib, poetry2nix }:
 poetry2nix.mkPoetryApplication {
   pyproject = ./pyproject.toml;
   poetrylock = ./poetry.lock;

diff --git a/tests/grpcio-wheel/default.nix b/tests/grpcio-wheel/default.nix
@@ -1,4 +1,4 @@
-{ poetry2nix, python3, pkgs, runCommand }:
+{ poetry2nix, python3, pkgs }:
 let
   inherit (pkgs.stdenv) isLinux;
   env = poetry2nix.mkPoetryEnv {

diff --git a/tests/markdown-it-py-wheel/default.nix b/tests/markdown-it-py-wheel/default.nix
@@ -1,4 +1,4 @@
-{ poetry2nix, python3, pkgs, runCommand }:
+{ poetry2nix, python3, pkgs }:
 let
   inherit (pkgs.stdenv) isLinux;
   env = poetry2nix.mkPoetryEnv {

diff --git a/tests/uwsgi/default.nix b/tests/uwsgi/default.nix
diff --git a/tests/uwsgi/poetry.lock b/tests/uwsgi/poetry.lock
diff --git a/tests/uwsgi/pyproject.toml b/tests/uwsgi/pyproject.toml
diff --git a/tests/uwsgi/test_uwsgi.py b/tests/uwsgi/test_uwsgi.py