philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

buildPython*: use pname

gstqt5
Frederik Rietdijk 2020-03-29 12:34:50 +02:00
parent 237bf9e7bc
commit 46ec52f329
24 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/cddb/default.nix
View File

@ -5,13 +5,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "CDDB-1.4"; pname = "CDDB";
version = "1.4";
disabled = isPy3k; disabled = isPy3k;
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz";
sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
}; };

3
pkgs/development/python-modules/deskcon/default.nix
View File

@ -7,7 +7,8 @@
}: }:
buildPythonPackage { buildPythonPackage {
name = "deskcon-0.3"; pname = "deskcon";
version = "0.3";
disabled = isPy3k; disabled = isPy3k;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {

3
pkgs/development/python-modules/gateone/default.nix
View File

@ -8,7 +8,8 @@
}: }:
buildPythonPackage { buildPythonPackage {
name = "gateone-1.2-0d57c3"; pname = "gateone";
version = "1.2-0d57c3";
disabled = isPy3k; disabled = isPy3k;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {

3
pkgs/development/python-modules/mutag/default.nix
View File

@ -6,7 +6,8 @@
}: }:
buildPythonPackage { buildPythonPackage {
name = "mutag-0.0.2-2ffa0258ca"; pname = "mutag";
version = "0.0.2-2ffa0258ca";
disabled = ! isPy3k; disabled = ! isPy3k;
src = fetchgit { src = fetchgit {

12
pkgs/development/python-modules/notmuch/default.nix
View File

@ -1,20 +1,18 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, pkgs , notmuch
, python , python
}: }:
buildPythonPackage { buildPythonPackage {
name = "python-${pkgs.notmuch.name}"; inherit (notmuch) pname version src;
src = pkgs.notmuch.src; sourceRoot = notmuch.pythonSourceRoot;
sourceRoot = pkgs.notmuch.pythonSourceRoot; buildInputs = [ python notmuch ];
buildInputs = [ python pkgs.notmuch ];
postPatch = '' postPatch = ''
sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \ sed -i -e '/CDLL/s@"libnotmuch\.@"${notmuch}/lib/libnotmuch.@' \
notmuch/globals.py notmuch/globals.py
''; '';

4
pkgs/development/python-modules/slob/default.nix
View File

@ -7,8 +7,8 @@
}: }:
buildPythonPackage { buildPythonPackage {
name = "slob"; pname = "slob";
verison = "unstable-2016-11-03"; version = "unstable-2016-11-03";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchFromGitHub { src = fetchFromGitHub {

3
pkgs/development/python-modules/tkinter/default.nix
View File

@ -6,7 +6,8 @@
}: }:
buildPythonPackage { buildPythonPackage {
name = "tkinter-${python.version}"; pname = "tkinter";
version = python.version;
src = py; src = py;
format = "other"; format = "other";

2
pkgs/misc/frescobaldi/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: { lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }:
buildPythonApplication rec { buildPythonApplication rec {
name = "frescobaldi-${version}"; pname = "frescobaldi";
version = "3.1.1"; version = "3.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/os-specific/linux/bcc/default.nix
View File

@ -4,8 +4,8 @@
}: }:
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "bcc";
version = "0.13.0"; version = "0.13.0";
name = "bcc-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";

7
pkgs/servers/amqp/qpid-cpp/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: { stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
let let
name = "qpid-cpp-${version}"; pname = "qpid-cpp";
name = "${pname}-${version}";
version = "1.39.0"; version = "1.39.0";
src = fetchurl { src = fetchurl {
@ -20,7 +21,7 @@ let
}; };
qpid-cpp = stdenv.mkDerivation { qpid-cpp = stdenv.mkDerivation {
inherit src meta name; inherit src meta pname version;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost libuuid ruby python2 ]; buildInputs = [ boost libuuid ruby python2 ];
@ -46,7 +47,7 @@ let
}; };
python-frontend = buildPythonPackage { python-frontend = buildPythonPackage {
inherit name meta src; inherit pname version meta src;
sourceRoot = "${name}/management/python"; sourceRoot = "${name}/management/python";

2
pkgs/servers/headphones/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2, makeWrapper }: { stdenv, fetchFromGitHub, python2, makeWrapper }:
python2.pkgs.buildPythonApplication rec { python2.pkgs.buildPythonApplication rec {
name = "headphones-${version}"; pname = "headphones";
version = "0.5.19"; version = "0.5.19";
src = fetchFromGitHub { src = fetchFromGitHub {

6
pkgs/servers/http/hyp/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, python3Packages }: { stdenv, fetchurl, python3Packages }:
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
name = "hyp-server-${version}"; pname = "hyp-server";
version = "1.2.0"; version = "1.2.0";
src = fetchurl { src = python3Packages.fetchPypi {
url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; inherit pname version;
sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
}; };

2
pkgs/servers/sickbeard/sickrage.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2, makeWrapper }: { stdenv, fetchFromGitHub, python2, makeWrapper }:
python2.pkgs.buildPythonApplication rec { python2.pkgs.buildPythonApplication rec {
name = "sickrage-${version}"; pname = "sickrage";
version = "v2018.07.21-1"; version = "v2018.07.21-1";
src = fetchFromGitHub { src = fetchFromGitHub {

5
pkgs/tools/X11/arandr/default.nix
View File

@ -5,8 +5,11 @@
let let
inherit (python3Packages) buildPythonApplication docutils pygobject3; inherit (python3Packages) buildPythonApplication docutils pygobject3;
pname = "arandr";
version = "0.1.10";
name = "${pname}-${version}";
in buildPythonApplication rec { in buildPythonApplication rec {
name = "arandr-0.1.10"; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz";

4
pkgs/tools/misc/mimeo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: { stdenv, fetchurl, desktop-file-utils, file, python3Packages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "mimeo-${version}"; pname = "mimeo";
version = "2019.7"; version = "2019.7";
src = fetchurl { src = fetchurl {
url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz";
sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r";
}; };

3
pkgs/tools/misc/trash-cli/default.nix
View File

@ -2,9 +2,8 @@
, python3Packages, substituteAll }: , python3Packages, substituteAll }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "trash-cli-${version}"; pname = "trash-cli";
version = "0.17.1.14"; version = "0.17.1.14";
namePrefix = "";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andreafrancia"; owner = "andreafrancia";

2
pkgs/tools/misc/unicode/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, python3Packages }: { stdenv, fetchFromGitHub, fetchurl, python3Packages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "unicode-${version}"; pname = "unicode";
version = "2.6"; version = "2.6";
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/tools/security/chipsec/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf { stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf
, kernel ? null, withDriver ? false }: , kernel ? null, withDriver ? false }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "chipsec-${version}"; pname = "chipsec";
version = "1.4.7"; version = "1.4.7";
src = fetchFromGitHub { src = fetchFromGitHub {

7
pkgs/tools/security/knockknock/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchFromGitHub, python2Packages, hping }: { stdenv, fetchFromGitHub, python2Packages, hping }:
let
python2Packages.buildPythonApplication rec {
rev = "bf14bbff"; rev = "bf14bbff";
name = "knockknock-r${rev}"; in python2Packages.buildPythonApplication rec {
pname = "knockknock-r";
version = rev;
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;

6
pkgs/tools/security/sshuttle/default.nix
View File

@ -2,12 +2,12 @@
, coreutils, iptables, nettools, openssh, procps }: , coreutils, iptables, nettools, openssh, procps }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "sshuttle-${version}"; pname = "sshuttle";
version = "0.78.5"; version = "0.78.5";
src = fetchurl { src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"; sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8";
url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
}; };
patches = [ ./sudo.patch ]; patches = [ ./sudo.patch ];

4
pkgs/tools/typesetting/rubber/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, python3Packages, texinfo }: { fetchurl, stdenv, python3Packages, texinfo }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "rubber-${version}"; pname = "rubber";
version = "1.5.1"; version = "1.5.1";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz"; url = "https://launchpad.net/rubber/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p"; sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p";
}; };

6
pkgs/tools/video/vnc2flv/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pythonPackages }: { stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "vnc2flv-20100207"; pname = "vnc2flv";
namePrefix = ""; version = "20100207";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/v/vnc2flv/${name}.tar.gz"; url = "mirror://pypi/v/vnc2flv/${pname}-${version}.tar.gz";
sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq"; sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq";
}; };

4
pkgs/tools/virtualization/euca2ools/default.nix
View File

@ -3,8 +3,8 @@
let let
inherit (python2Packages) buildPythonApplication boto m2crypto; inherit (python2Packages) buildPythonApplication boto m2crypto;
in buildPythonApplication { in buildPythonApplication {
name = "euca2ools-2.1.4"; pname = "euca2ools";
namePrefix = ""; version = "2.1.4";
src = fetchgit { src = fetchgit {
url = https://github.com/eucalyptus/euca2ools.git; url = https://github.com/eucalyptus/euca2ools.git;

4
pkgs/top-level/python-packages.nix
View File

@ -4590,7 +4590,9 @@ in {
notify2 = callPackage ../development/python-modules/notify2 {}; notify2 = callPackage ../development/python-modules/notify2 {};
notmuch = callPackage ../development/python-modules/notmuch { }; notmuch = callPackage ../development/python-modules/notmuch {
inherit (pkgs) notmuch;
};
emoji = callPackage ../development/python-modules/emoji { }; emoji = callPackage ../development/python-modules/emoji { };