public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge older staging with added firefox-related updates

Browse Source
This commit is contained in:
Vladimír Čunát 2018-06-29 21:06:39 +02:00
commit 2059bf9e39
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
531 changed files with 900 additions and 1394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/dr14_tmeter/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python3Packages, pkgs }:
python3Packages.buildPythonApplication rec {
name = "dr14_tmeter-${version}";
pname = "dr14_tmeter";
version = "1.0.16";
disabled = !python3Packages.isPy3k;

2
pkgs/applications/audio/gpodder/default.nix
View File

@ -4,7 +4,7 @@
}:
python3Packages.buildPythonApplication rec {
name = "gpodder-${version}";
pname = "gpodder";
version = "3.10.3";
format = "other";

5
pkgs/applications/audio/gtklick/default.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchurl, pythonPackages, gettext, klick}:
pythonPackages.buildPythonApplication rec {
name = "gtklick-${version}";
namePrefix = "";
pname = "gtklick";
version = "0.6.4";
src = fetchurl {
url = "http://das.nasophon.de/download/${name}.tar.gz";
url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
};

3
pkgs/applications/audio/lastfmsubmitd/default.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "lastfmsubmitd-${version}";
namePrefix = "";
pname = "lastfmsubmitd";
version = "1.0.6";
src = fetchurl {

3
pkgs/applications/audio/lastwatch/default.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchgit, python2Packages }:
python2Packages.buildPythonApplication rec {
name = "lastwatch-${version}";
namePrefix = "";
pname = "lastwatch";
version = "0.4.1";
src = fetchgit {

8
pkgs/applications/audio/mimms/default.nix
View File

@ -1,9 +1,9 @@
{ fetchurl, stdenv, pythonPackages, libmms }:
let version = "3.2";
in
pythonPackages.buildPythonApplication {
name = "mimms-${version}";
pythonPackages.buildPythonApplication rec {
pname = "mimms";
version = "3.2";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml";

3
pkgs/applications/audio/mopidy/default.nix
View File

@ -3,8 +3,7 @@
}:
pythonPackages.buildPythonApplication rec {
name = "mopidy-${version}";
pname = "mopidy";
version = "2.1.0";
src = fetchFromGitHub {

2
pkgs/applications/audio/mopidy/gmusic.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-gmusic-${version}";
pname = "mopidy-gmusic";
version = "2.0.0";
src = fetchurl {

3
pkgs/applications/audio/mopidy/local-images.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-local-images-${version}";
pname = "mopidy-local-images";
version = "1.0.0";
src = fetchFromGitHub {

3
pkgs/applications/audio/mopidy/local-sqlite.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-local-sqlite-${version}";
pname = "mopidy-local-sqlite";
version = "1.0.0";
src = fetchFromGitHub {

3
pkgs/applications/audio/mopidy/musicbox-webclient.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-musicbox-webclient-${version}";
pname = "mopidy-musicbox-webclient";
version = "2.3.0";
src = fetchFromGitHub {

3
pkgs/applications/audio/mopidy/soundcloud.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-soundcloud-${version}";
pname = "mopidy-soundcloud";
version = "2.0.2";
src = fetchFromGitHub {

3
pkgs/applications/audio/mopidy/spotify-tunigo.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-spotify-tunigo-${version}";
pname = "mopidy-spotify-tunigo";
version = "1.0.0";
src = fetchFromGitHub {

2
pkgs/applications/audio/mopidy/spotify.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-spotify-${version}";
pname = "mopidy-spotify";
version = "3.1.0";
src = fetchurl {

3
pkgs/applications/audio/mopidy/youtube.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
pythonPackages.buildPythonApplication rec {
name = "mopidy-youtube-${version}";
pname = "mopidy-youtube";
version = "2.0.2";
src = fetchFromGitHub {

7
pkgs/applications/audio/picard/default.nix
View File

@ -1,11 +1,10 @@
{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
let
version = "1.4.2";
pythonPackages = python2Packages;
in pythonPackages.buildPythonApplication {
name = "picard-${version}";
namePrefix = "";
in pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "1.4.2";
src = fetchurl {
url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";

2
pkgs/applications/audio/puddletag/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
python2Packages.buildPythonApplication rec {
name = "puddletag-${version}";
pname = "puddletag";
version = "1.2.0";
src = fetchFromGitHub {

2
pkgs/applications/audio/quodlibet/default.nix
View File

@ -8,7 +8,7 @@
let optionals = stdenv.lib.optionals; in
python3.pkgs.buildPythonApplication rec {
name = "quodlibet${tag}-${version}";
pname = "quodlibet${tag}";
version = "4.1.0";
# XXX, tests fail

2
pkgs/applications/audio/sonata/default.nix
View File

@ -4,7 +4,7 @@
let
inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
in buildPythonApplication rec {
name = "sonata-${version}";
pname = "sonata";
version = "1.7b1";
src = fetchFromGitHub {

2
pkgs/applications/editors/neovim/neovim-remote.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
pythonPackages.buildPythonPackage rec {
name = "neovim-remote-${version}";
pname = "neovim-remote";
version = "2.0.5";
disabled = !pythonPackages.isPy3k;

2
pkgs/applications/editors/nvpy/default.nix
View File

@ -4,7 +4,7 @@ let
pythonPackages = python2Packages;
in pythonPackages.buildPythonApplication rec {
version = "0.9.7";
name = "nvpy-${version}";
pname = "nvpy";
src = fetchurl {
url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz";

2
pkgs/applications/editors/rednotebook/default.nix
View File

@ -4,7 +4,7 @@
}:
buildPythonApplication rec {
name = "rednotebook-${version}";
pname = "rednotebook";
version = "2.3";
src = fetchFromGitHub {

3
pkgs/applications/graphics/displaycal/default.nix
View File

@ -3,7 +3,8 @@
, argyllcms, wxPython, numpy
}:
buildPythonPackage {
name = "displaycal-3.5.0.0";
pname = "displaycal";
version = "3.5.0.0";
enableParallelBuilding = true;

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

23
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -1,13 +1,14 @@
{ pname, version, updateScript ? null
, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta
, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? []
, overrides ? {}, extraNativeBuildInputs ? [], meta
, isTorBrowserLike ? false }:
{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, icu, libpng, jemalloc
, cairo, icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages
, debugBuild ? false
@ -80,22 +81,22 @@ stdenv.mkDerivation (rec {
nspr libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */
icu libpng jemalloc
libevent libstartup_notification libvpx /* cairo */
icu libpng jemalloc glib
]
++ lib.optionals (!isTorBrowserLike) [ nss ]
++ lib.optional (lib.versionOlder version "61") hunspell
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
++ lib.optional gtk3Support gtk3
++ lib.optional gssSupport kerberos;
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook;
[ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook ++ extraNativeBuildInputs;
preConfigure = ''
# remove distributed configuration files
@ -113,7 +114,7 @@ stdenv.mkDerivation (rec {
cxxLib=$( echo -n ${gcc}/include/c++/* )
archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
@ -134,7 +135,6 @@ stdenv.mkDerivation (rec {
"--with-system-png" # needs APNG support
"--with-system-icu"
"--enable-system-ffi"
"--enable-system-hunspell"
"--enable-system-pixman"
"--enable-system-sqlite"
#"--enable-system-cairo"
@ -148,6 +148,7 @@ stdenv.mkDerivation (rec {
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell"
++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
# on i686-linux: --with-libclang-path is not available in this configuration
"--with-libclang-path=${llvmPackages.libclang}/lib"

32
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
let
@ -6,10 +6,6 @@ let
nixpkgsPatches = [
./env_var_for_system_dir.patch
# this one is actually an omnipresent bug
# https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
./fix-pa-context-connect-retval.patch
];
firefox60_aarch64_skia_patch = fetchpatch {
@ -24,15 +20,17 @@ rec {
firefox = common rec {
pname = "firefox";
version = "60.0.2";
version = "61.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2my4v8al3swwbiqcp3a5y89imly6apc2p9q0cbkhbiz0sqylc0l02jh0qp95migmik56m4prwqdi81kgqs7cw5r2np3mm6sc1b45mkg";
sha512 = "0ww2j5gxr7h142lfi0xvckvd7vmnha72j8c0wyyqmmp1rr341f10vfd0hvawiagik4ih6dz8h5pmkl67zdnwqc3z75vwnci20ajlg2s";
};
patches = nixpkgsPatches ++ [
./no-buildconfig.patch
] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
];
extraNativeBuildInputs = [ python3 ];
meta = {
description = "A web browser built from Firefox source tree";
@ -47,13 +45,17 @@ rec {
firefox-esr-52 = common rec {
pname = "firefox-esr";
version = "52.8.1esr";
version = "52.9.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "a4883550fdf62e66b10f1de7416d3614a2cb0ce3a004d9a79ecc37a726794d7bbdb0a6767faab4ea97278d2192462597551fc13b7e9a9c38d043c2879d51095a";
sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9";
};
patches = nixpkgsPatches;
patches = nixpkgsPatches ++ [
# this one is actually an omnipresent bug
# https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
./fix-pa-context-connect-retval.patch
];
meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree";
@ -66,14 +68,18 @@ rec {
firefox-esr-60 = common rec {
pname = "firefox-esr";
version = "60.0.2esr";
version = "60.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "0vbilh4iwqfzkj598zbgkmwbkxh4bia8gn7p9x6xd7yvhb6708p4dfkkbg61hdh3bddyaxx1zd0wi8qxfxbrx19mc6k9dpc6xz52iy1";
sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6";
};
patches = nixpkgsPatches ++ [
./no-buildconfig.patch
# this one is actually an omnipresent bug
# https://bugzilla.mozilla.org/show_bug.cgi?id=1444519
./fix-pa-context-connect-retval.patch
] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
meta = firefox.meta // {

6
pkgs/development/libraries/nss/default.nix
View File

@ -8,11 +8,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.36.4";
version = "3.38";
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_36_4_RTM/src/${name}.tar.gz";
sha256 = "0si4g5bnhzkxy2f7rnaw86jfdzni5gvc7svxcf7ms8n97nrrdpik";
url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz";
sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c";
};
buildInputs = [ perl zlib sqlite ]

13
pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch
View File

@ -2,21 +2,10 @@ diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Serve
index 670bd74..7b3bd2e 100644
--- a/lib/CatalystX/Script/Server/Starman.pm
+++ b/lib/CatalystX/Script/Server/Starman.pm
@@ -9,7 +9,7 @@ our $VERSION = '0.02';
@@ -9,5 +9,5 @@ our $VERSION = '0.02';
extends 'Catalyst::Script::Server';
-has '+fork' => ( default => 1, init_arg => undef );
+has '+fork' => ( default => 1 );
has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' );
@@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman
-d --debug force debug mode
-f --fork handle each request in a new process
- (defaults to false)
+ (defaults to true)
-? --help display this help and exits
-h --host host (defaults to all)
-p --port port (defaults to 3000)

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

@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "3to2";
version = "1.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/APScheduler/default.nix
View File

@ -21,7 +21,6 @@
buildPythonPackage rec {
pname = "APScheduler";
version = "3.5.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/Flask-PyMongo/default.nix
View File

@ -8,7 +8,6 @@
buildPythonPackage rec {
pname = "Flask-PyMongo";
name = "${pname}-${version}";
version = "0.5.2";
src = fetchPypi {

1
pkgs/development/python-modules/FormEncode/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "FormEncode";
version = "1.3.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/GeoIP/default.nix
View File

@ -3,7 +3,6 @@
, geoip, nose}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "GeoIP";
version = "1.3.2";

1
pkgs/development/python-modules/Pmw/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "Pmw";
version = "2.0.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/PyLD/default.nix
View File

@ -21,7 +21,6 @@ in
buildPythonPackage rec {
pname = "PyLD";
version = "0.7.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "digitalbazaar";

1
pkgs/development/python-modules/Pygments/default.nix
View File

@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "Pygments";
version = "2.2.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/ROPGadget/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "ROPGadget";
version = "5.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/Theano/default.nix
View File

@ -40,7 +40,6 @@ let
libgpuarray_ = libgpuarray.override { inherit cudaSupport; };
in buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Theano";
version = "1.0.2";

1
pkgs/development/python-modules/Wand/default.nix
View File

@ -16,7 +16,6 @@ let
in buildPythonPackage rec {
pname = "Wand";
version = "0.4.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/XlsxWriter/default.nix
View File

@ -1,7 +1,6 @@
{lib, buildPythonPackage, fetchPypi}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "XlsxWriter";
version = "1.0.5";

1
pkgs/development/python-modules/aafigure/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "aafigure";
version = "0.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/acme-tiny/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "acme-tiny";
version = "2016-03-26";
name = "${pname}-${version}";
src = fetchFromGitHub {
sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";

1
pkgs/development/python-modules/acme/default.nix
View File

@ -18,7 +18,6 @@ buildPythonPackage rec {
inherit (certbot) src version;
pname = "acme";
name = "${pname}-${version}";
propagatedBuildInputs = [
cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock

1
pkgs/development/python-modules/acoustics/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "acoustics";
version = "0.1.2";
name = "${pname}-${version}";
buildInputs = [ cython pytest ];
propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];

1
pkgs/development/python-modules/actdiag/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "actdiag";
version = "0.5.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/adal/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "adal";
version = "1.0.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/aenum/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "aenum";
version = "2.1.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/agate-dbf/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "agate-dbf";
version = "0.2.0";

1
pkgs/development/python-modules/agate-excel/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "agate-excel";
version = "0.2.2";

1
pkgs/development/python-modules/agate-sql/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "agate-sql";
version = "0.5.3";

1
pkgs/development/python-modules/agate/default.nix
View File

@ -3,7 +3,6 @@
leather, python-slugify }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "agate";
version = "1.6.1";

1
pkgs/development/python-modules/aioamqp/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "aioamqp";
name = "${pname}-${version}";
version = "0.11.0";
meta = {

1
pkgs/development/python-modules/aiodns/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "aiodns";
version = "1.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/aiofiles/default.nix
View File

@ -10,7 +10,6 @@
buildPythonPackage rec {
pname = "aiofiles";
version = "0.3.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/alabaster/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "alabaster";
version = "0.7.11";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/alembic/default.nix
View File

@ -4,7 +4,6 @@
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "alembic";
version = "0.9.9";

1
pkgs/development/python-modules/amqplib/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "amqplib";
version = "0.6.1";
name = "${pname}-${version}";
src = fetchurl {
url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz;

1
pkgs/development/python-modules/aniso8601/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "aniso8601";
version = "3.0.2";
name = "${pname}-${version}";
meta = with stdenv.lib; {
description = "Parses ISO 8601 strings.";

1
pkgs/development/python-modules/ansicolor/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "ansicolor";
version = "0.2.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

8
pkgs/development/python-modules/antlr4-python3-runtime/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
buildPythonPackage rec {
pname = "antlr4-python3-runtime";
version = "4.7.1";
name = "antlr4-python3-runtime-${version}";
disabled = !isPy3k;
src = fetchurl {
url = "mirror://pypi/a/antlr4-python3-runtime/${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv";
};

1
pkgs/development/python-modules/apipkg/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "apipkg";
version = "1.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/appdirs/default.nix
View File

@ -6,7 +6,6 @@
buildPythonPackage rec {
pname = "appdirs";
version = "1.4.3";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/area53/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "Area53";
version = "0.94";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/argcomplete/default.nix
View File

@ -2,7 +2,6 @@
coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "argcomplete";
version = "1.9.4";

1
pkgs/development/python-modules/args/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "args";
version = "0.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/asana/default.nix
View File

@ -5,7 +5,6 @@
buildPythonPackage rec {
pname = "asana";
version = "0.7.0";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "asana";

1
pkgs/development/python-modules/asn1crypto/default.nix
View File

@ -6,7 +6,6 @@
buildPythonPackage rec {
pname = "asn1crypto";
version = "0.24.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/astor/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "astor";
version = "0.6.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/astroid/default.nix
View File

@ -4,7 +4,6 @@
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "astroid";
version = "1.6.5";

1
pkgs/development/python-modules/audioread/default.nix
View File

@ -5,7 +5,6 @@
buildPythonPackage rec {
pname = "audioread";
name = "${pname}-${version}";
version = "2.1.6";
src = fetchPypi {

7
pkgs/development/python-modules/autobahn/default.nix
View File

@ -1,15 +1,14 @@
{ stdenv, buildPythonPackage, fetchurl, isPy3k, isPy33,
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
unittest2, mock, pytest, trollius, asyncio,
pytest-asyncio, futures,
six, twisted, txaio, zope_interface
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "autobahn";
version = "18.6.1";
src = fetchurl {
url = "mirror://pypi/a/${pname}/${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "2f41bfc512ec482044fa8cfa74182118dedd87e03b3494472d9ff1b5a1e27d24";
};

8
pkgs/development/python-modules/automat/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl,
{ stdenv, buildPythonPackage, fetchPypi,
m2r, setuptools_scm, six, attrs }:
buildPythonPackage rec {
version = "0.7.0";
pname = "Automat";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/A/Automat/${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e";
};

1
pkgs/development/python-modules/autopep8/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "autopep8";
version = "1.3.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/backports_csv/default.nix
View File

@ -4,7 +4,6 @@ buildPythonPackage rec {
pname = "backports.csv";
version = "1.0.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/backports_tempfile/default.nix
View File

@ -9,7 +9,6 @@
buildPythonPackage rec {
pname = "backports.tempfile";
version = "1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/backports_unittest-mock/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "backports.unittest_mock";
version = "1.3";

1
pkgs/development/python-modules/backports_weakref/default.nix
View File

@ -7,7 +7,6 @@
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "backports.weakref";
version = "1.0.post1";
src = fetchPypi {

1
pkgs/development/python-modules/bap/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "bap";
version = "1.3.1";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-python";

1
pkgs/development/python-modules/bash_kernel/default.nix
View File

@ -11,7 +11,6 @@
buildPythonPackage rec {
pname = "bash_kernel";
version = "0.7.1";
name = "${pname}-${version}";
format = "flit";
disabled = isPy27;

1
pkgs/development/python-modules/bayespy/default.nix
View File

@ -5,7 +5,6 @@
buildPythonPackage rec {
pname = "bayespy";
version = "0.5.17";
name = "${pname}-${version}";
# Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly.

7
pkgs/development/python-modules/bcrypt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, isPyPy, fetchurl
{ stdenv, buildPythonPackage, isPyPy, fetchPypi
, cffi, pycparser, mock, pytest, py, six }:
with stdenv.lib;
@ -6,10 +6,9 @@ with stdenv.lib;
buildPythonPackage rec {
version = "3.1.4";
pname = "bcrypt";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d";
};
buildInputs = [ pycparser mock pytest py ];

1
pkgs/development/python-modules/beautifulsoup4/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, nose }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "beautifulsoup4";
version = "4.6.0";

1
pkgs/development/python-modules/behave/default.nix
View File

@ -7,7 +7,6 @@
buildPythonApplication rec {
pname = "behave";
version = "1.2.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/bitcoin-price-api/default.nix
View File

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "bitcoin-price-api";
version = "0.0.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/bitcoinlib/default.nix
View File

@ -4,7 +4,6 @@ let ext = if stdenv.isDarwin then "dylib" else "so";
in buildPythonPackage rec {
pname = "bitcoinlib";
version = "0.9.0";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "petertodd";

1
pkgs/development/python-modules/bitstring/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "bitstring";
version = "3.1.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/bkcharts/default.nix
View File

@ -9,7 +9,6 @@
buildPythonPackage rec {
pname = "bkcharts";
version = "0.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit version pname;

1
pkgs/development/python-modules/blessed/default.nix
View File

@ -2,7 +2,6 @@
, glibcLocales }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "blessed";
version = "1.15.0";

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

@ -8,13 +8,12 @@ let
cryptsetupWithPython = cryptsetup.override pyenable;
in buildPythonPackage rec {
pname = "blivet";
name = "${pname}-${version}";
version = "0.67";
src = fetchFromGitHub {
owner = "dwlehman";
repo = "blivet";
rev = name;
rev = "${pname}-${version}";
sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky";
};

1
pkgs/development/python-modules/botocore/default.nix
View File

@ -10,7 +10,6 @@
}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "botocore";
version = "1.10.9";

1
pkgs/development/python-modules/branca/default.nix
View File

@ -9,7 +9,6 @@
buildPythonPackage rec {
pname = "branca";
version = "0.3.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

7
pkgs/development/python-modules/breathe/default.nix
View File

@ -1,12 +1,11 @@
{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
buildPythonPackage rec {
version = "4.9.1";
pname = "breathe";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/b/breathe/${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "76e1f3706efeda2610d9a8e7b421d2877ff0654a3fe6d3190a8686536111a684";
};

1
pkgs/development/python-modules/browsermob-proxy/default.nix
View File

@ -8,7 +8,6 @@
buildPythonPackage rec {
pname = "browsermob-proxy";
version = "0.8.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/btrees/default.nix
View File

@ -10,7 +10,6 @@
buildPythonPackage rec {
pname = "BTrees";
version = "4.5.0";
name = "${pname}-${version}";
buildInputs = [ transaction ];
propagatedBuildInputs = [ persistent zope_interface ];

7
pkgs/development/python-modules/buildout-nix/default.nix
View File

@ -1,12 +1,11 @@
{ fetchurl, stdenv, buildPythonPackage }:
{ fetchPypi, stdenv, buildPythonPackage }:
buildPythonPackage rec {
pname = "zc.buildout";
version = "2.11.5";
name = "${pname}-nix-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "537a22715d82362cddd811da08d11a31d30d5161ce7994b208bd85ebb348d122";
};

1
pkgs/development/python-modules/bz2file/default.nix
View File

@ -7,7 +7,6 @@
buildPythonPackage rec {
pname = "bz2file";
version = "0.98";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/cachetools/1.nix
View File

@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cachetools";
version = "2.1.0";
disabled = isPyPy; # a test fails

1
pkgs/development/python-modules/cachetools/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cachetools";
version = "2.1.0";

1
pkgs/development/python-modules/cccolutils/default.nix
View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "CCColUtils";
version = "1.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

1
pkgs/development/python-modules/cffi/default.nix
View File

@ -3,7 +3,6 @@
if isPyPy then null else buildPythonPackage rec {
pname = "cffi";
version = "1.11.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

Some files were not shown because too many files have changed in this diff Show More