about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilip Taron <philip.taron@gmail.com>2024-03-19 20:45:13 -0700
committerValentin Gagarin <valentin.gagarin@tweag.io>2024-03-28 21:30:46 +0100
commit4ede2c365781a036c4710188cd4cd168c6cdf5c5 (patch)
tree38fce12d5a92e693f04eabd34a1adc7cbbe4fd17
parent28164c6434380425fa4d9b8e6ab3c26698226eb2 (diff)
downloadnixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.tar
nixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.tar.gz
nixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.tar.bz2
nixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.tar.lz
nixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.tar.xz
nixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.tar.zst
nixlib-4ede2c365781a036c4710188cd4cd168c6cdf5c5.zip
Avoid top-level `with ...;` in pkgs/tools/misc/bepasty/default.nix
-rw-r--r--pkgs/tools/misc/bepasty/default.nix23
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index c38963ade2f3..1e3f22642321 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -2,6 +2,7 @@
 , python3
 , fetchPypi
 }:
+
 let
   # bepasty 1.2 needs xstatic-font-awesome < 5, see
   # https://github.com/bepasty/bepasty-server/issues/305
@@ -17,16 +18,18 @@ let
       });
     };
   };
+in
+
+# We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
+# This is needed for services.bepasty
+# https://github.com/NixOS/nixpkgs/pull/38300
 
-#We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
-#This is needed for services.bepasty
-#https://github.com/NixOS/nixpkgs/pull/38300
-in with bepastyPython.pkgs; buildPythonPackage rec {
+bepastyPython.pkgs.buildPythonPackage rec {
   pname = "bepasty";
   version = "1.2.1";
   format = "pyproject";
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with bepastyPython.pkgs; [
     flask
     markupsafe
     pygments
@@ -42,14 +45,14 @@ in with bepastyPython.pkgs; buildPythonPackage rec {
     xstatic-pygments
   ];
 
-  buildInputs = [ setuptools-scm ];
+  buildInputs = with bepastyPython.pkgs; [ setuptools-scm ];
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-08cyr2AruGAfHAwHHS8WMfJh7DBKymaYyz4AxI/ubkE=";
   };
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with bepastyPython.pkgs; [
     build
     codecov
     flake8
@@ -70,10 +73,10 @@ in with bepastyPython.pkgs; buildPythonPackage rec {
     "src/bepasty/tests/test_website.py"
   ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/bepasty/bepasty-server";
     description = "Binary pastebin server";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ aither64 makefu ];
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ aither64 makefu ];
   };
 }