treewide/servers: use top-level fetchPypi

figsoda 22ec7aeb 16b0cc00

+28 -27
+2 -2
pkgs/servers/calibre-web/default.nix
··· 2 2 , fetchFromGitHub 3 3 , nixosTests 4 4 , python3 5 - , fetchpatch 5 + , fetchPypi 6 6 }: 7 7 8 8 let ··· 10 10 packageOverrides = self: super: { 11 11 sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { 12 12 version = "1.4.46"; 13 - src = self.fetchPypi { 13 + src = fetchPypi { 14 14 pname = "SQLAlchemy"; 15 15 inherit version; 16 16 hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
+4 -8
pkgs/servers/home-assistant/default.nix
··· 3 3 , callPackage 4 4 , fetchFromGitHub 5 5 , fetchPypi 6 - , fetchpatch 7 6 , python3 8 7 , substituteAll 9 8 , ffmpeg-headless ··· 17 16 18 17 # Additional packages to add to propagatedBuildInputs 19 18 , extraPackages ? ps: [] 20 - 21 - # Write out info about included extraComponents and extraPackages 22 - , writeText 23 19 24 20 # Override Python packages using 25 21 # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } ··· 47 43 astral = super.astral.overridePythonAttrs (oldAttrs: rec { 48 44 pname = "astral"; 49 45 version = "2.2"; 50 - src = self.fetchPypi { 46 + src = fetchPypi { 51 47 inherit pname version; 52 48 hash = "sha256-5B2ZZ9XEi+QhNGVS8PTe2tQ/85qDV09f8q0ytmJ7b74="; 53 49 }; ··· 141 137 # Pinned due to API changes in 0.1.0 142 138 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { 143 139 version = "0.0.8"; 144 - src = super.fetchPypi { 140 + src = fetchPypi { 145 141 pname = "poolsense"; 146 142 inherit version; 147 143 hash = "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc="; ··· 200 196 python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { 201 197 pname = "python-slugify"; 202 198 version = "4.0.1"; 203 - src = super.fetchPypi { 199 + src = fetchPypi { 204 200 inherit pname version; 205 201 hash = "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA="; 206 202 }; ··· 247 243 248 244 sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { 249 245 version = "2.0.12"; 250 - src = super.fetchPypi { 246 + src = fetchPypi { 251 247 pname = "SQLAlchemy"; 252 248 inherit version; 253 249 hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w=";
+2 -2
pkgs/servers/http/hyp/default.nix
··· 1 - { lib, fetchurl, python3Packages }: 1 + { lib, python3Packages, fetchPypi }: 2 2 3 3 python3Packages.buildPythonPackage rec { 4 4 pname = "hyp-server"; 5 5 version = "1.2.0"; 6 6 7 - src = python3Packages.fetchPypi { 7 + src = fetchPypi { 8 8 inherit pname version; 9 9 sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; 10 10 };
+4 -4
pkgs/servers/mail/mailman/python.nix
··· 1 - { python3 }: 1 + { python3, fetchPypi }: 2 2 3 3 python3.override { 4 4 packageOverrides = self: super: { ··· 7 7 doCheck = false; 8 8 }); 9 9 # Fixes `AssertionError: database connection isn't set to UTC` 10 - psycopg2 = super.psycopg2.overridePythonAttrs (a: (rec { 10 + psycopg2 = super.psycopg2.overridePythonAttrs (a: rec { 11 11 version = "2.8.6"; 12 - src = super.fetchPypi { 12 + src = fetchPypi { 13 13 inherit version; 14 14 inherit (a) pname; 15 15 sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543"; 16 16 }; 17 - })); 17 + }); 18 18 }; 19 19 }
+3 -2
pkgs/servers/matrix-synapse/tools/synadm.nix
··· 1 1 { lib 2 + , python3 3 + , fetchPypi 2 4 , nix-update-script 3 - , python3 4 5 }: 5 6 6 7 python3.pkgs.buildPythonApplication rec { ··· 8 9 version = "0.41.2"; 9 10 format = "setuptools"; 10 11 11 - src = python3.pkgs.fetchPypi { 12 + src = fetchPypi { 12 13 inherit pname version; 13 14 hash = "sha256-wSpgc1umBMLCc2ThfYSuNNnzqWXyEQM0XhTuOAQaiXg="; 14 15 };
+2 -1
pkgs/servers/mautrix-telegram/default.nix
··· 1 1 { lib 2 2 , python3 3 + , fetchPypi 3 4 , fetchFromGitHub 4 5 , withE2BE ? true 5 6 }: ··· 10 11 tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { 11 12 version = "1.28.0a3"; 12 13 pname = "tulir-telethon"; 13 - src = super.fetchPypi { 14 + src = fetchPypi { 14 15 inherit pname version; 15 16 hash = "sha256-N1XQGpjfyUqcT+bsSBxC5Purvnd/+4NzVzMhiaq5yDo="; 16 17 };
+2 -1
pkgs/servers/monitoring/alerta/client.nix
··· 1 1 { lib 2 2 , python3 3 + , fetchPypi 3 4 }: 4 5 5 6 python3.pkgs.buildPythonApplication rec { 6 7 pname = "alerta"; 7 8 version = "8.5.1"; 8 9 9 - src = python3.pkgs.fetchPypi { 10 + src = fetchPypi { 10 11 inherit pname version; 11 12 sha256 = "sha256-O13Ic2iHjNF/llp6vdaAiiWExcTBPsz46GAWY3oGDY8="; 12 13 };
+3 -2
pkgs/servers/monitoring/alerta/default.nix
··· 1 1 { lib 2 2 , python3 3 + , fetchPypi 3 4 }: 4 5 5 6 python3.pkgs.buildPythonApplication rec { 6 7 pname = "alerta-server"; 7 8 version = "8.7.0"; 8 9 9 - src = python3.pkgs.fetchPypi { 10 + src = fetchPypi { 10 11 inherit pname version; 11 12 sha256 = "sha256-EM3owmj+6gFjU0ARaQP3FLYXliGaGCRSaLgkiPwhGdU="; 12 13 }; ··· 31 32 sentry-sdk 32 33 ]; 33 34 34 - # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server 35 + # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server 35 36 doCheck = false; 36 37 37 38 pythonImportsCheck = [
+2 -2
pkgs/servers/monitoring/prometheus/kea-exporter.nix
··· 1 - { lib, python3Packages, nixosTests }: 1 + { lib, python3Packages, fetchPypi, nixosTests }: 2 2 3 3 python3Packages.buildPythonApplication rec { 4 4 pname = "kea-exporter"; 5 5 version = "0.5.1"; 6 6 format = "pyproject"; 7 7 8 - src = python3Packages.fetchPypi { 8 + src = fetchPypi { 9 9 inherit pname version; 10 10 hash = "sha256-rNGA5XEx9xVUP1SeDPgXcaqgDhgX6JFhRX9GM454P5A="; 11 11 };
+2 -1
pkgs/servers/monitoring/prometheus/pve-exporter.nix
··· 1 1 { lib 2 2 , python3 3 + , fetchPypi 3 4 , nixosTests 4 5 }: 5 6 ··· 7 8 pname = "prometheus-pve-exporter"; 8 9 version = "2.2.2"; 9 10 10 - src = python3.pkgs.fetchPypi { 11 + src = fetchPypi { 11 12 inherit pname version; 12 13 sha256 = "0vvsiw8nj8zkx6v42f260xbsdd92l0ac4vwpm7w38j3qwvanar7k"; 13 14 };
-1
pkgs/servers/pinnwand/default.nix
··· 1 1 { lib 2 2 , python3 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , nixosTests 6 5 }: 7 6
+2 -1
pkgs/servers/pinnwand/steck.nix
··· 1 1 { lib 2 2 , pkgs 3 3 , python3Packages 4 + , fetchPypi 4 5 , nixosTests 5 6 }: 6 7 ··· 8 9 pname = "steck"; 9 10 version = "0.7.0"; 10 11 11 - src = python3Packages.fetchPypi { 12 + src = fetchPypi { 12 13 inherit pname version; 13 14 sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1"; 14 15 };