Commit 22ec7aeb authored by figsoda's avatar figsoda
Browse files

treewide/servers: use top-level fetchPypi

parent 16b0cc00

pkgs/servers/calibre-web/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, fetchFromGitHub

, nixosTests

, python3

, fetchpatch

, fetchPypi

}:



let
@@ -10,7 +10,7 @@ let 
    packageOverrides = self: super: {

      sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {

        version = "1.4.46";

        src = self.fetchPypi {

        src = fetchPypi {

          pname = "SQLAlchemy";

          inherit version;

          hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";

pkgs/servers/home-assistant/default.nix

+4 −8
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
, callPackage

, fetchFromGitHub

, fetchPypi

, fetchpatch

, python3

, substituteAll

, ffmpeg-headless
@@ -18,9 +17,6 @@ 
# Additional packages to add to propagatedBuildInputs

, extraPackages ? ps: []



# Write out info about included extraComponents and extraPackages

, writeText



# Override Python packages using

# self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }

# Applied after defaultOverrides
@@ -47,7 +43,7 @@ let 
      astral = super.astral.overridePythonAttrs (oldAttrs: rec {

        pname = "astral";

        version = "2.2";

        src = self.fetchPypi {

        src = fetchPypi {

          inherit pname version;

          hash = "sha256-5B2ZZ9XEi+QhNGVS8PTe2tQ/85qDV09f8q0ytmJ7b74=";

        };
@@ -141,7 +137,7 @@ let 
      # Pinned due to API changes in 0.1.0

      poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec {

        version = "0.0.8";

        src = super.fetchPypi {

        src = fetchPypi {

          pname = "poolsense";

          inherit version;

          hash = "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=";
@@ -200,7 +196,7 @@ let 
      python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {

        pname = "python-slugify";

        version = "4.0.1";

        src = super.fetchPypi {

        src = fetchPypi {

          inherit pname version;

          hash = "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=";

        };
@@ -247,7 +243,7 @@ let 


      sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {

        version = "2.0.12";

        src = super.fetchPypi {

        src = fetchPypi {

          pname = "SQLAlchemy";

          inherit version;

          hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w=";

pkgs/servers/http/hyp/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, fetchurl, python3Packages }:

{ lib, python3Packages, fetchPypi }:



python3Packages.buildPythonPackage rec {

  pname = "hyp-server";

  version = "1.2.0";



  src = python3Packages.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";

  };

pkgs/servers/mail/mailman/python.nix

+4 −4
Original line number Diff line number Diff line 
{ python3 }:

{ python3, fetchPypi }:



python3.override {

  packageOverrides = self: super: {
@@ -7,13 +7,13 @@ python3.override { 
      doCheck = false;

    });

    # Fixes `AssertionError: database connection isn't set to UTC`

    psycopg2 = super.psycopg2.overridePythonAttrs (a: (rec {

    psycopg2 = super.psycopg2.overridePythonAttrs (a: rec {

      version = "2.8.6";

      src = super.fetchPypi {

      src = fetchPypi {

        inherit version;

        inherit (a) pname;

        sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543";

      };

    }));

    });

  };

}

pkgs/servers/matrix-synapse/tools/synadm.nix

+3 −2
Original line number Diff line number Diff line 
{ lib

, nix-update-script

, python3

, fetchPypi

, nix-update-script

}:



python3.pkgs.buildPythonApplication rec {
@@ -8,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { 
  version = "0.41.2";

  format = "setuptools";



  src = python3.pkgs.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-wSpgc1umBMLCc2ThfYSuNNnzqWXyEQM0XhTuOAQaiXg=";

  };