diff options
Diffstat (limited to 'pkgs/applications')
28 files changed, 86 insertions, 67 deletions
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index e5fc811d43ff7..b525d16b390ff 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,10 +1,11 @@ { lib , python3 -, xorg -, argyllcms +, fetchPypi , wrapGAppsHook , gtk3 , librsvg +, xorg +, argyllcms }: python3.pkgs.buildPythonApplication rec { @@ -12,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { version = "3.9.10"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { pname = "DisplayCAL"; inherit version; hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index b03073349f3f4..6bdf149c9b97b 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "dosage"; version = "2.17"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index 2f481252d881d..136d0fe128361 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivationWith , python3Packages +, fetchPypi , p7zip , archiveSupport ? true }: @@ -9,7 +10,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "kcc"; version = "5.5.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit version; pname = "KindleComicConverter"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; @@ -25,7 +26,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { qtWrapperArgs = lib.optionals archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ]; - postFixup = '' + postFixup = '' wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}" ''; diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index 1ef77cbe4f1b4..d630ceda6a589 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -1,14 +1,15 @@ -{ python3Packages -, qtbase +{ lib +, python3Packages +, fetchPypi , wrapQtAppsHook -, lib +, qtbase }: python3Packages.buildPythonApplication rec { pname = "veusz"; version = "3.6.2"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE="; }; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index a3b5b591f6ead..bb426beb0ca9c 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -6,10 +6,7 @@ , wrapGAppsHook }: -let - inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi; -in -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "MeerK40t"; version = "0.8.1000"; format = "setuptools"; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 2c839e84a4e6d..81ddb68b69e0d 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,10 +1,10 @@ -{ lib, python3 }: +{ lib, python3, fetchPypi }: python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "3.0.2"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; # This enables accessing modules stored in cwd - makeWrapperArgs = ["--prefix PYTHONPATH . :"]; + makeWrapperArgs = [ "--prefix PYTHONPATH . :" ]; meta = with lib; { description = "Python package that helps you build complex pipelines of batch jobs"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/spotify/luigi"; changelog = "https://github.com/spotify/luigi/releases/tag/${version}"; - license = [ licenses.asl20 ]; + license = [ licenses.asl20 ]; maintainers = [ maintainers.bhipple ]; }; } diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 5ee8db44cc7cc..776bfd501b000 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, python3Packages }: +{ lib, python3Packages, fetchPypi, stdenv }: python3Packages.buildPythonApplication rec { pname = "dyndnsc"; version = "0.6.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4"; }; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix index c67df416c5c6c..77aa94a3b863a 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix @@ -1,11 +1,13 @@ { lib , python3 +, fetchPypi }: + python3.pkgs.buildPythonPackage rec { pname = "listparser"; version = "0.18"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b"; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 330c67c435509..0052caa3ef8b0 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , fetchFromGitHub }: @@ -8,7 +9,7 @@ let packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { version = "1.4.48"; - src = self.fetchPypi { + src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-tHvChwltmJoIOM6W99jpZpFKJNqHftQadTHUS1XNuN8="; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index ac0687900f179..341f4628dc3b2 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, notmuch }: +{ lib, python3Packages, fetchPypi, notmuch }: python3Packages.buildPythonApplication rec { pname = "afew"; version = "3.0.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; }; diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index f95439b2fb1b5..7d3be7c62bafa 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -1,10 +1,10 @@ -{ lib, python3, notmuch }: +{ lib, python3, fetchPypi }: python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; version = "0.0.9"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; }; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index cbbe40f08e4d3..3a5b4c09f164d 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,11 +1,11 @@ -{ lib, python3 }: +{ lib, python3, fetchPypi }: python3.pkgs.buildPythonApplication rec { pname = "fava"; version = "1.24.4"; format = "pyproject"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc="; }; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 1343f2e8d392c..397193c4e0db1 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3Packages +, fetchPypi , wrapGAppsHook , gtk3 , gobject-introspection @@ -8,13 +9,13 @@ , poppler_gi , withGstreamer ? stdenv.isLinux , withVLC ? stdenv.isLinux - }: +}: python3Packages.buildPythonApplication rec { pname = "pympress"; version = "1.7.2"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI="; }; diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index 6a63aba4a1784..61a4c7694b754 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -1,16 +1,17 @@ { lib -, copyDesktopItems -, makeDesktopItem , python3 -, qtsvg +, fetchPypi +, copyDesktopItems , wrapQtAppsHook +, qtsvg +, makeDesktopItem }: python3.pkgs.buildPythonApplication rec { pname = "pyspread"; version = "2.0.2"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8="; }; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index ff4835411ef51..cae2a4b68297c 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,5 +1,6 @@ { lib , python3Packages +, fetchPypi , pkg-config , librsvg , gobject-introspection @@ -24,7 +25,7 @@ python3Packages.buildPythonApplication rec { disabled = !python3Packages.isPy3k; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1rca19krvmycdhmi1vb4ixwq0cagmrkhbqry4f19b725nlp8cv0q"; }; diff --git a/pkgs/applications/science/biology/MACS2/default.nix b/pkgs/applications/science/biology/MACS2/default.nix index 868479c48e550..5663ffaf44865 100644 --- a/pkgs/applications/science/biology/MACS2/default.nix +++ b/pkgs/applications/science/biology/MACS2/default.nix @@ -1,10 +1,10 @@ -{ lib, python3, fetchurl }: +{ lib, python3, fetchPypi }: python3.pkgs.buildPythonPackage rec { pname = "MACS2"; version = "2.2.7.1"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d"; }; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 02b2d2d61ac02..adbcb95974303 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3 +, fetchPypi , fetchFromBitbucket , fetchpatch , substituteAll @@ -12,7 +13,7 @@ let packageOverrides = self: super: { shapely = super.shapely.overridePythonAttrs (old: rec { version = "1.8.4"; - src = self.fetchPypi { + src = fetchPypi { pname = "Shapely"; inherit version; hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; @@ -30,7 +31,8 @@ let }); }; }; -in python.pkgs.buildPythonApplication rec { +in +python.pkgs.buildPythonApplication rec { pname = "flatcam"; version = "8.5"; diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/applications/search/xlsxgrep/default.nix index 8c62ae5736daa..18b3a1a26c873 100644 --- a/pkgs/applications/search/xlsxgrep/default.nix +++ b/pkgs/applications/search/xlsxgrep/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "xlsxgrep"; version = "0.0.23"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; }; diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index fb5e0c8322886..3a1a51f83f8ea 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -1,10 +1,10 @@ -{ lib, python3, git, mercurial}: +{ lib, python3, fetchPypi, git, mercurial }: python3.pkgs.buildPythonApplication rec { pname = "bumpver"; version = "2021.1110"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03"; }; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ]; - nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial ]; disabledTests = [ # fails due to more aggressive setuptools version specifier validation diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 3009edcb90a38..22127c1141106 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -1,10 +1,10 @@ -{ lib, git, python3Packages }: +{ lib, python3Packages, fetchPypi, git }: python3Packages.buildPythonApplication rec { pname = "git-aggregator"; version = "2.1.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; }; diff --git a/pkgs/applications/version-management/git-big-picture/default.nix b/pkgs/applications/version-management/git-big-picture/default.nix index decd3c51a392f..959031fad9f95 100644 --- a/pkgs/applications/version-management/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-big-picture/default.nix @@ -1,21 +1,21 @@ -{ python3Packages, lib, git, graphviz }: +{ lib, python3Packages, fetchPypi, git, graphviz }: python3Packages.buildPythonApplication rec { pname = "git-big-picture"; version = "1.1.1"; format = "wheel"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit format version; - pname = "git_big_picture"; # underscores needed for working download URL - python = "py3"; # i.e. no Python 2.7 + pname = "git_big_picture"; # underscores needed for working download URL + python = "py3"; # i.e. no Python 2.7 sha256 = "a20a480057ced1585c4c38497d27a5012f12dd29697313f0bb8fa6ddbb5c17d8"; }; postFixup = '' wrapProgram $out/bin/git-big-picture \ --prefix PATH ":" ${ lib.makeBinPath [ git graphviz ] } - ''; + ''; meta = { description = "Tool for visualization of Git repositories"; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 308c04b05d603..e4bd7e3ad8c10 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,5 +1,6 @@ { lib , pythonPackages +, fetchPypi , git }: @@ -7,7 +8,7 @@ pythonPackages.buildPythonApplication rec { pname = "git-up"; version = "1.6.1"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za"; }; @@ -29,10 +30,10 @@ pythonPackages.buildPythonApplication rec { # 2. $HOME is by default not a valid dir, so we have to set that too # https://github.com/NixOS/nixpkgs/issues/12591 preCheck = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - ''; + export HOME=$TMPDIR + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + ''; postInstall = '' rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/applications/version-management/gomp/default.nix index efdef3b967f8c..3f60ba8b7acfc 100644 --- a/pkgs/applications/version-management/gomp/default.nix +++ b/pkgs/applications/version-management/gomp/default.nix @@ -1,12 +1,13 @@ { lib , python3Packages - }: +, fetchPypi +}: python3Packages.buildPythonApplication rec { pname = "gomp"; version = "1.1.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb"; }; diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix index 33efad77f9089..fd2875b13be2a 100644 --- a/pkgs/applications/version-management/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -1,12 +1,13 @@ { lib , python3Packages +, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "legit"; version = "1.2.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; }; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index e88f21a85cb15..027bba16e86c9 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , coreutils , git , mercurial @@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.6.1"; pname = "nbstripout"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM="; }; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index ed167aeb91cbb..3ed220561c420 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, python3, fetchFromGitHub, buildNpmPackage, jq }: +{ lib +, python3 +, fetchPypi +, buildNpmPackage +, fetchFromGitHub +, jq +, stdenv +}: let python = python3.override { @@ -6,7 +13,7 @@ let # pyCA is incompatible with SQLAlchemy 2.0 sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { version = "1.4.46"; - src = self.fetchPypi { + src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 664cbcf2db3f6..a4250ee9938b7 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages +, fetchPypi , ffmpeg -, fetchpatch }: python3Packages.buildPythonApplication rec { @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { version = "5.3.0"; format = "pyproject"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE="; }; diff --git a/pkgs/applications/window-managers/i3/altlayout.nix b/pkgs/applications/window-managers/i3/altlayout.nix index d66ae35723601..91f663907a0ab 100644 --- a/pkgs/applications/window-managers/i3/altlayout.nix +++ b/pkgs/applications/window-managers/i3/altlayout.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "i3altlayout"; version = "0.3"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf"; }; |