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

Restore more accurate history of the master branch

Browse Source 
The first child is the proper master.
The second child is the proper staging.
The third child is FRidh work.
The forth child is the previous master at origin.
This commit is contained in:
Orivej Desh
2017-11-25 11:37:17 +00:00
parent 88eea6947f 9d2bd32b79 c06bc73222 5233333265
commit fbbda41e05
147 changed files with 600 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/office/paperwork/backend.nix
+1 -1
View File
@@ -9,7 +9,7 @@
}:
buildPythonPackage rec {
name = "paperwork-backend-${version}";
pname = "paperwork-backend";
version = "1.2.1";
src = fetchFromGitHub {
pkgs/build-support/setup-hooks/multiple-outputs.sh
+1 -11
View File
@@ -164,8 +164,6 @@ _multioutDevs() {
}
# Make the "dev" propagate other outputs needed for development.
# Note: with current cross-building setup, all packages are "native" if not cross-building;
# however, if cross-building, the outputs are non-native. We have to choose the right file.
_multioutPropagateDev() {
if [ "$outputs" = "out" ]; then return; fi;
@@ -193,16 +191,8 @@ _multioutPropagateDev() {
return
fi
local propagatedBuildInputsFile
if [ -z "$crossConfig" ]; then
propagatedBuildInputsFile=propagated-native-build-inputs
else
propagatedBuildInputsFile=propagated-build-inputs
fi
mkdir -p "${!propagaterOutput}"/nix-support
for output in $propagatedBuildOutputs; do
echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/propagated-build-inputs
done
}
pkgs/build-support/trivial-builders.nix
+1 -1
View File
@@ -101,7 +101,7 @@ rec {
mkdir -p $out/nix-support
cp ${script} $out/nix-support/setup-hook
'' + lib.optionalString (deps != []) ''
printWords ${toString deps} > $out/nix-support/propagated-native-build-inputs
printWords ${toString deps} > $out/nix-support/propagated-build-inputs
'' + lib.optionalString (substitutions != {}) ''
substituteAll ${script} $out/nix-support/setup-hook
'');
pkgs/data/misc/tzdata/default.nix
+2 -1
View File
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
postInstall =
''
rm $out/share/zoneinfo-posix
ln -s . $out/share/zoneinfo/posix
mkdir $out/share/zoneinfo/posix
( cd $out/share/zoneinfo/posix; ln -s ../* .; rm posix )
mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
mkdir -p "$dev/include"
pkgs/desktops/plasma-5/default.nix
+1 -5
View File
@@ -58,11 +58,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
if [ -n "$crossConfig" ]; then
propagatedBuildInputs="$propagatedBuildInputs @dev@"
else
propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@"
fi
propagatedBuildInputs="$propagatedBuildInputs @dev@"
fi
fi
'';
pkgs/development/compilers/jsonnet/default.nix
+1
View File
@@ -4,6 +4,7 @@ let version = "0.9.4"; in
stdenv.mkDerivation {
name = "jsonnet-${version}";
version = version;
src = fetchFromGitHub {
rev = "v${version}";
pkgs/development/compilers/openjdk-darwin/8.nix
+1 -1
View File
@@ -33,7 +33,7 @@ let
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
pkgs/development/compilers/openjdk-darwin/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ let
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
pkgs/development/compilers/openjdk/7.nix
+2 -2
View File
@@ -184,13 +184,13 @@ let
preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre
propagatedNativeBuildInputs+=" $jre"
propagatedBuildInputs+=" $jre"
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
pkgs/development/compilers/openjdk/8.nix
+2 -2
View File
@@ -206,13 +206,13 @@ let
preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre
propagatedNativeBuildInputs+=" $jre"
propagatedBuildInputs+=" $jre"
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
printWords ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $jre/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
pkgs/development/compilers/openjdk/9.nix
+2 -2
View File
@@ -204,14 +204,14 @@ let
preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre
propagatedNativeBuildInputs+=" $jre"
propagatedBuildInputs+=" $jre"
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+1 -1
View File
@@ -166,7 +166,7 @@ let result = stdenv.mkDerivation rec {
ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
pkgs/development/compilers/oraclejdk/jdk9-linux.nix
+1 -1
View File
@@ -124,7 +124,7 @@ let result = stdenv.mkDerivation rec {
ln -s $out $out/jre
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
pkgs/development/compilers/zulu/8.nix
+1 -1
View File
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
pkgs/development/compilers/zulu/default.nix
+1 -1
View File
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
pkgs/development/interpreters/python/build-python-package.nix
+11 -5
View File
@@ -1,11 +1,14 @@
/* This function provides a generic Python package builder. It is
intended to work with packages that use `distutils/setuptools'
(http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */
# This function provides a generic Python package builder,
# and can build packages that use distutils, setuptools or flit.
{ lib
, python
, mkPythonDerivation
, wrapPython
, setuptools
, unzip
, ensureNewerSourcesHook
, pythonModule
, namePrefix
, bootstrapped-pip
, flit
}:
@@ -15,6 +18,9 @@ let
flit-specific = import ./build-python-package-flit.nix { inherit python flit; };
wheel-specific = import ./build-python-package-wheel.nix { };
common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
mkPythonDerivation = import ./mk-python-derivation.nix {
inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook pythonModule namePrefix;
};
in
{
pkgs/development/interpreters/python/cpython/2.7/default.nix
+1 -1
View File
@@ -201,7 +201,7 @@ in stdenv.mkDerivation {
in rec {
inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
executable = libPrefix;
buildEnv = callPackage ../../wrapper.nix { python = self; };
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
isPy2 = true;
pkgs/development/interpreters/python/cpython/3.4/default.nix
+1 -1
View File
@@ -160,7 +160,7 @@ in stdenv.mkDerivation {
in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
isPy3 = true;
pkgs/development/interpreters/python/cpython/3.5/default.nix
+1 -1
View File
@@ -154,7 +154,7 @@ in stdenv.mkDerivation {
in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
isPy3 = true;
pkgs/development/interpreters/python/cpython/3.6/default.nix
+1 -1
View File
@@ -153,7 +153,7 @@ in stdenv.mkDerivation {
in rec {
inherit libPrefix sitePackages x11Support;
executable = "${libPrefix}m";
buildEnv = callPackage ../../wrapper.nix { python = self; };
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
isPy3 = true;
pkgs/development/interpreters/python/mk-python-derivation.nix
+17 -17
View File
@@ -1,4 +1,4 @@
/* Generic builder for Python packages that come without a setup.py. */
# Generic builder.
{ lib
, python
@@ -6,13 +6,13 @@
, setuptools
, unzip
, ensureNewerSourcesHook
# Whether the derivation provides a Python module or not.
, pythonModule
, namePrefix
}:
{ name ? "${attrs.pname}-${attrs.version}"
# by default prefix `name` e.g. "python3.3-${name}"
, namePrefix ? python.libPrefix + "-"
# Dependencies for building the package
, buildInputs ? []
@@ -54,18 +54,21 @@ if disabled
then throw "${name} not supported for interpreter ${python.executable}"
else
python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
python.stdenv.mkDerivation (builtins.removeAttrs attrs [
"disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts"
] // {
name = namePrefix + name;
inherit pythonPath;
buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ]
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
++ lib.optionals doCheck checkInputs;
++ lib.optionals doCheck checkInputs
++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools
++ buildInputs
++ pythonPath
);
# propagate python/setuptools to active setup-hook in nix-shell
# Propagate python and setuptools. We should stop propagating setuptools.
propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
# Python packages don't have a checkPhase, only an installCheckPhase
@@ -83,15 +86,12 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"
passthru = {
inherit python; # The python interpreter
inherit pythonModule;
} // passthru;
meta = with lib.maintainers; {
meta = {
# default to python's platforms
platforms = python.meta.platforms;
} // meta // {
# add extra maintainer(s) to every package
maintainers = (meta.maintainers or []) ++ [ chaoflow ];
# a marker for release utilities to discover python packages
isBuildPythonPackage = python.meta.platforms;
};
} // meta;
})
pkgs/development/interpreters/python/pypy/2.7/default.nix
+1 -1
View File
@@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
inherit zlibSupport libPrefix sitePackages;
executable = "pypy";
isPypy = true;
buildEnv = callPackage ../../wrapper.nix { python = self; };
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
interpreter = "${self}/bin/${executable}";
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
pkgs/development/interpreters/python/wrap.sh
+2 -2
View File
@@ -83,7 +83,7 @@ wrapPythonProgramsIn() {
# Adds the lib and bin directories to the PYTHONPATH and PATH variables,
# respectively. Recurses on any paths declared in
# `propagated-native-build-inputs`, while avoiding duplicating paths by
# `propagated-build-inputs`, while avoiding duplicating paths by
# flagging the directories it has visited in `pythonPathsSeen`.
_addToPythonPath() {
local dir="$1"
@@ -96,7 +96,7 @@ _addToPythonPath() {
addToSearchPath program_PATH $dir/bin
# Inspect the propagated inputs (if they exist) and recur on them.
local prop="$dir/nix-support/propagated-native-build-inputs"
local prop="$dir/nix-support/propagated-build-inputs"
if [ -e $prop ]; then
local new_path
for new_path in $(cat $prop); do
pkgs/development/interpreters/python/wrapper.nix
+4 -3
View File
@@ -2,13 +2,14 @@
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
, ignoreCollisions ? false }:
, ignoreCollisions ? false
, requiredPythonModules
, }:
# Create a python executable that knows about additional packages.
let
recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; };
env = let
paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ;
paths = requiredPythonModules (extraLibs ++ [ python ] ) ;
in buildEnv {
name = "${python.name}-env";
pkgs/development/libraries/boost/generic.nix
+1 -1
View File
@@ -125,7 +125,7 @@ in
stdenv.mkDerivation {
name = "boost-${version}";
inherit src patches;
inherit src patches version;
meta = {
homepage = http://boost.org/;
pkgs/development/libraries/grantlee/5/setup-hook.sh
+7 -13
View File
@@ -4,20 +4,14 @@ providesGrantleeRuntime() {
[ -d "$1/$grantleePluginPrefix" ]
}
_grantleeCrossEnvHook() {
if providesQtRuntime "$1"; then
_grantleeEnvHook() {
if providesGrantleeRuntime "$1"; then
propagatedBuildInputs+=" $1"
propagatedUserEnvPkgs+=" $1"
fi
}
crossEnvHooks+=(_grantleeCrossEnvHook)
_grantleeEnvHook() {
if providesGrantleeRuntime "$1"; then
propagatedNativeBuildInputs+=" $1"
if [ -z "$crossConfig" ]; then
propagatedUserEnvPkgs+=" $1"
fi
fi
}
envHooks+=(_grantleeEnvHook)
if [ "$crossEnv" ]; then
crossEnvHooks+=(_grantleeEnvHook)
else
envHooks+=(_grantleeEnvHook)
fi
pkgs/development/libraries/kde-frameworks/default.nix
+1 -5
View File
@@ -56,11 +56,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
if [ -n "$crossConfig" ]; then
propagatedBuildInputs="$propagatedBuildInputs @dev@"
else
propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@"
fi
propagatedBuildInputs="$propagatedBuildInputs @dev@"
fi
fi
'';
pkgs/development/libraries/kmsxx/default.nix
+3 -1
View File
@@ -1,7 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }:
stdenv.mkDerivation rec {
name = "kmsxx-2017-10-10";
pname = "kmsxx";
version = "2017-10-10";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "tomba";
pkgs/development/libraries/libinput/default.nix
+2 -2
View File
@@ -16,11 +16,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
version = "1.9.1";
version = "1.9.2";
src = fetchurl {
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h";
sha256 = "0fyy050hzk47g7305lx5pgyh2abvq7qs4xd3nn1is7zy3wj56s6x";
};
outputs = [ "out" "dev" ];
pkgs/development/libraries/libxml2/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@ let
in stdenv.mkDerivation rec {
name = "libxml2-${version}";
version = "2.9.5";
version = "2.9.7";
src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz";
sha256 = "0f6d5nkvcfx8yqis2dwrnv6qaj0nhiifz49y657vmrwwxvnc2ca0";
sha256 = "034hylzspvkm0p4bczqbf8q05a7r2disr8dz725x4bin61ymwg7n";
};
outputs = [ "bin" "dev" "out" "man" "doc" ]
pkgs/development/libraries/libxslt/default.nix
+4 -2
View File
@@ -10,7 +10,9 @@ assert pythonSupport -> libxml2.pythonSupport;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libxslt-1.1.29";
pname = "libxslt";
version = "1.1.29";
name = pname + "-" + version;
src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz";
@@ -51,7 +53,7 @@ stdenv.mkDerivation rec {
moveToOutput share/man/man1 "$bin"
'' + optionalString pythonSupport ''
mkdir -p $py/nix-support
echo ${libxml2.py} >> $py/nix-support/propagated-native-build-inputs
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
moveToOutput lib/python2.7 "$py"
'';
pkgs/development/libraries/physics/rivet/default.nix
-2
View File
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
postPatch = "patchShebangs ./src/Analyses/cat_with_lines";
pythonPath = []; # python wrapper support
patches = [
./darwin.patch # configure relies on impure sw_vers to -Dunix
];
pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh
+6 -15
View File
@@ -33,7 +33,7 @@ addToQMAKEPATH() {
# package depending on the building package. (This is necessary in case
# the building package does not provide runtime dependencies itself and so
# would not be propagated to the user environment.)
qtCrossEnvHook() {
qtEnvHook() {
addToQMAKEPATH "$1"
if providesQtRuntime "$1"; then
if [ "z${!outputBin}" != "z${!outputDev}" ]; then
@@ -42,20 +42,11 @@ qtCrossEnvHook() {
propagatedUserEnvPkgs+=" $1"
fi
}
crossEnvHooks+=(qtCrossEnvHook)
qtEnvHook() {
addToQMAKEPATH "$1"
if providesQtRuntime "$1"; then
if [ "z${!outputBin}" != "z${!outputDev}" ]; then
propagatedNativeBuildInputs+=" $1"
fi
if [ -z "$crossConfig" ]; then
propagatedUserEnvPkgs+=" $1"
fi
fi
}
envHooks+=(qtEnvHook)
if [ "$crossConfig" ]; then
crossEnvHooks+=(qtEnvHook)
else
envHooks+=(qtEnvHook)
fi
postPatchMkspecs() {
local bin="${!outputBin}"
pkgs/development/perl-modules/generic/builder.sh
+2 -2
View File
@@ -34,8 +34,8 @@ postFixup() {
# dependencies in the user environment (since Perl modules don't
# have something like an RPATH, so the only way to find the
# dependencies is to have them in the PERL5LIB variable).
if test -e $out/nix-support/propagated-native-build-inputs; then
ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
if test -e $out/nix-support/propagated-build-inputs; then
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
fi
}
pkgs/development/python-modules/absl-py/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "absl-py";
version = "0.1.3";
version = "0.1.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "017wc85i7l3vpjzw3shgb7k7n0jfid88g09dlf1kgdy4ll0sjfax";
sha256 = "94943ed0cd77077fe2d18e79b2f28d3e92f585f7d1c6edc75e640121f3c5d580";
};
propagatedBuildInputs = [ six ];
pkgs/development/python-modules/aiohttp/default.nix
+2 -2
View File
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "aiohttp";
version = "2.3.2";
version = "2.3.3";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736";
sha256 = "0a2e33e90560dacb819b095b9d9611597925d75d1b93dd9490055d3826d98a82";
};
disabled = pythonOlder "3.4";
pkgs/development/python-modules/arelle/default.nix
+2 -1
View File
@@ -5,8 +5,9 @@
... }:
buildPythonPackage rec {
name = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
version = "2017-08-24";
name = pname + "-" + version;
disabled = !isPy3k;
pkgs/development/python-modules/argcomplete/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "argcomplete";
version = "1.9.2";
version = "1.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed";
sha256 = "d97b7f3cfaa4e494ad59ed6d04c938fc5ed69b590bd8f53274e258fb1119bd1b";
};
doCheck = false; # bash-completion test fails with "compgen: command not found".
pkgs/development/python-modules/asn1ate/default.nix
+2 -1
View File
@@ -4,7 +4,8 @@
buildPythonPackage rec {
pname = "asn1ate";
date = "20160810";
name = "${pname}-unstable-${date}";
version = "unstable-${date}";
name = "${pname}-${version}";
src = fetchFromGitHub {
sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
pkgs/development/python-modules/augeas/default.nix
+2 -1
View File
@@ -1,7 +1,8 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
buildPythonPackage rec {
name = "augeas-${version}";
pname = "augeas";
version = "1.0.2";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "hercules-team";
pkgs/development/python-modules/blockdiag/default.nix
+2 -1
View File
@@ -3,8 +3,9 @@
}:
buildPythonPackage rec {
name = "blockdiag-${version}";
pname = "blockdiag";
version = "1.5.3";
name = pname + "-" + version;
src = fetchurl {
url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
pkgs/development/python-modules/bootstrapped-pip/default.nix
+2 -2
View File
@@ -9,9 +9,9 @@ let
};
setuptools_source = fetchPypi {
pname = "setuptools";
version = "36.4.0";
version = "36.7.1";
format = "wheel";
sha256 = "4d54c0bfee283e78609169213f9c075827d5837086f58b588b417b093c23464b";
sha256 = "eaacfa35eb11199d0b017df416421781a75209817bff3f94820556e36c49bd77";
};
# TODO: Shouldn't be necessary anymore for pip > 9.0.1!
pkgs/development/python-modules/bottleneck/default.nix
+3 -2
View File
@@ -8,8 +8,9 @@
buildPythonPackage rec {
pname = "Bottleneck";
name = "Bottleneck-${version}";
version = "1.2.1";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36";
@@ -23,4 +24,4 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" ""
'';
}
}
pkgs/development/python-modules/cgroup-utils/default.nix
+2 -1
View File
@@ -2,7 +2,8 @@
buildPythonPackage rec {
version = "0.6";
name = "cgroup-utils-${version}";
pname = "cgroup-utils";
name = pname + "-" + version;
buildInputs = [ pep8 nose ];
# Pep8 tests fail...
pkgs/development/python-modules/construct/default.nix
+2 -1
View File
@@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }:
buildPythonPackage rec {
name = "construct-${version}";
pname = "construct";
version = "2.8.16";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "construct";
pkgs/development/python-modules/coverage/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "coverage";
version = "4.4.1";
version = "4.4.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424";
sha256 = "309d91bd7a35063ec7a0e4d75645488bfab3f0b66373e7722f23da7f5b0f34cc";
};
# No tests in archive
pkgs/development/python-modules/cufflinks/default.nix
+2 -2
View File
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "cufflinks";
version = "0.12.0";
version = "0.12.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "04ninvwm6277n3hqc17ririss90cd832wza3q3vf115rrrds3xyy";
sha256 = "8f11e4b6326cc5b2a18011c09fb64f178ba21002f337fd305f64818012a6c679";
};
propagatedBuildInputs = [ pandas plotly colorlover ];
pkgs/development/python-modules/cymem/default.nix
+5 -4
View File
@@ -5,8 +5,9 @@
, python
}:
buildPythonPackage rec {
name = "cymem-${version}";
pname = "cymem";
version = "1.31.2";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "explosion";
@@ -16,14 +17,14 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
cython
cython
];
checkPhase = ''
cd cymem/tests
${python.interpreter} -m unittest discover -p "*test*"
'';
meta = with stdenv.lib; {
description = "Cython memory pool for RAII-style memory management";
homepage = https://github.com/explosion/cymem;
pkgs/development/python-modules/django-hijack/default.nix
+3 -2
View File
@@ -2,8 +2,9 @@
django, django_compat, django_nose
}:
buildPythonPackage rec {
name = "django-hijack-${version}";
pname = "django-hijack";
version = "2.1.4";
name = pname + "-" + version;
# the pypi packages don't include everything required for the tests
src = fetchFromGitHub {
@@ -36,4 +37,4 @@ buildPythonPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ ris ];
};
}
}
pkgs/development/python-modules/djangorestframework/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, django }:
buildPythonPackage rec {
version = "3.7.1";
version = "3.7.3";
pname = "djangorestframework";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
sha256 = "305b2c6564ca46d3b558ba21110ed717135c467adf1a6dfd192bd85f4bb04d50";
sha256 = "067960e5e9e5586d3b2d53a1d626c4800dc33cd8309487d404fc63355674556f";
};
# Test settings are missing
pkgs/development/python-modules/dkimpy/default.nix
+2 -1
View File
@@ -2,10 +2,11 @@
, pytest, dns }:
buildPythonApplication rec {
name = "${pname}-${majorversion}.${minorversion}";
name = "${pname}-${version}";
pname = "dkimpy";
majorversion = "0.6";
minorversion = "2";
version = "${majorversion}.${minorversion}";
src = fetchurl {
url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz";
pkgs/development/python-modules/dulwich/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
, git, glibcLocales }:
buildPythonPackage rec {
version = "0.18.5";
version = "0.18.6";
pname = "dulwich";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/dulwich/${name}.tar.gz";
sha256 = "838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0";
sha256 = "38a04406bc68315794c3bab37c7d4ed137fb8a839482d8894e72b0d9b3eb41a9";
};
LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/ecpy/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "ECPy";
version = "0.8.1";
version = "0.8.2";
src = fetchPypi {
inherit pname version;
sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
sha256 = "0509a90714448ef47ef727cb7aee3415995c883c945e972521b5838fa4c50e24";
};
buildInputs = [ hidapi pycrypto pillow protobuf future ];
pkgs/development/python-modules/faker/default.nix
+2 -2
View File
@@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null;
buildPythonPackage rec {
pname = "Faker";
version = "0.8.6";
version = "0.8.7";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "3c98dd04bba667ecfddb77fcd0dfd19b376b258d21beeaf5b95578826e275a83";
sha256 = "bf7dabcd6807c8829da28a4de491adf7998af506b8571db6a6eb58161157248a";
};
checkInputs = [
pkgs/development/python-modules/first/default.nix
+3 -4
View File
@@ -1,10 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi }:
let
buildPythonPackage rec {
pname = "first";
version = "2.0.1";
in
buildPythonPackage {
name = "${pname}-${version}";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
pkgs/development/python-modules/geopandas/default.nix
+2 -1
View File
@@ -3,8 +3,9 @@
, pytest }:
buildPythonPackage rec {
name = "geopandas-${version}";
pname = "geopandas";
version = "0.3.0";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "geopandas";
pkgs/development/python-modules/gevent/default.nix
+4 -9
View File
@@ -1,20 +1,15 @@
{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }:
buildPythonPackage rec {
name = "gevent-1.1.2";
pname = "gevent";
version = "1.2.2";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/g/gevent/${name}.tar.gz";
sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c";
sha256 = "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7";
};
# Why do we have this patch?
postPatch = ''
substituteInPlace libev/ev.c --replace \
"ecb_inline void ecb_unreachable (void) ecb_noreturn" \
"ecb_inline ecb_noreturn void ecb_unreachable (void)"
'';
buildInputs = [ libev ];
propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ];
pkgs/development/python-modules/gflags/default.nix
+2 -1
View File
@@ -2,7 +2,8 @@
buildPythonPackage rec {
version = "3.1.2";
name = "gflags-${version}";
pname = "gflags";
name = pname + "-" + version;
src = fetchPypi {
inherit version;
pkgs/development/python-modules/hmmlearn/default.nix
+2 -1
View File
@@ -1,8 +1,9 @@
{ lib, fetchurl, buildPythonPackage, numpy }:
buildPythonPackage rec {
name = "hmmlearn-${version}";
pname = "hmmlearn";
version = "0.2.0";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
pkgs/development/python-modules/hyperlink/default.nix
+5 -3
View File
@@ -1,11 +1,13 @@
{ stdenv, buildPythonPackage, fetchurl, pytest }:
buildPythonPackage rec {
name = "hyperlink-${version}";
version = "17.3.0";
pname = "hyperlink";
version = "17.3.1";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/h/hyperlink/${name}.tar.gz";
sha256 = "06mgnxwjzx8hv34bifc7jvgxz21ixhk5s6xy2kd84hdrlbfvpbfx";
sha256 = "bc4ffdbde9bdad204d507bd8f554f16bba82dd356f6130cb16f41422909c33bc";
};
checkInputs = [ pytest ];
pkgs/development/python-modules/ipywidgets/default.nix
+2 -2
View File
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "ipywidgets";
version = "7.0.3";
version = "7.0.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "f98b4c3719097c9d2e6489f303db520b20bd4de3e0b1d6d4f92f81bfe3c2a0c8";
sha256 = "321be3dc48193130ba16e8080172bb5cd052eb65e3ad0ea7b5f80ff73e24bc54";
};
# Tests are not distributed
pkgs/development/python-modules/jedi/default.nix
+4
View File
@@ -10,6 +10,10 @@ buildPythonPackage rec {
sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396";
};
postPatch = ''
substituteInPlace requirements.txt --replace "parso==0.1.0" "parso"
'';
checkInputs = [ pytest glibcLocales tox pytestcov ];
propagatedBuildInputs = [ parso ];
pkgs/development/python-modules/keras/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "Keras";
version = "2.0.9";
version = "2.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767";
sha256 = "f0ca2458c60d9711edf4291230b31795307ad3781cb6232ff4792b53c8f55123";
};
checkInputs = [
pkgs/development/python-modules/keystoneclient/default.nix
+2 -1
View File
@@ -9,8 +9,9 @@
}:
buildPythonPackage rec {
name = "keystoneclient-${version}";
pname = "keystoneclient";
version = "1.8.1";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "openstack";
pkgs/development/python-modules/keyutils/default.nix
+1 -2
View File
@@ -1,9 +1,8 @@
{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }:
let
buildPythonPackage rec {
pname = "keyutils";
version = "0.5";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
pkgs/development/python-modules/libgpuarray/default.nix
+11 -10
View File
@@ -1,4 +1,4 @@
{ stdenv
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
@@ -11,18 +11,19 @@
, python
, cudaSupport ? false, cudatoolkit
, openclSupport ? true, ocl-icd, clblas
}:
}:
buildPythonPackage rec {
name = "libgpuarray-${version}";
pname = "libgpuarray";
version = "0.6.9";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "Theano";
owner = "Theano";
repo = "libgpuarray";
rev = "v${version}";
sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0";
};
};
# requires a GPU
doCheck = false;
@@ -43,7 +44,7 @@ buildPythonPackage rec {
export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE"
cd ..
'';
'';
postFixup = ''
rm $out/lib/libgpuarray-static.a
@@ -64,11 +65,11 @@ buildPythonPackage rec {
enableParallelBuilding = true;
buildInputs = [
cmake
cython
buildInputs = [
cmake
cython
nose
];
];
meta = with stdenv.lib; {
homepage = "https://github.com/Theano/libgpuarray";
pkgs/development/python-modules/libtmux/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "libtmux";
version = "0.7.5";
version = "0.7.7";
src = fetchPypi {
inherit pname version;
sha256 = "12e5006e59b7d98af5d1a9294f9c8ff2829ac2c1c6ae23dc73c280100b15f485";
sha256 = "5670c8da8d0192d932ac1e34f010e0eeb098cdb2af6daad0307b5418e7a37733";
};
buildInputs = [ pytest_29 ];
pkgs/development/python-modules/llfuse/default.nix
+3 -1
View File
@@ -3,7 +3,9 @@
}:
buildPythonPackage rec {
name = "llfuse-1.0";
pname = "llfuse";
version = "1.0";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
pkgs/development/python-modules/locustio/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ buildPythonPackage
, fetchPypi
, mock
, unittest2
, msgpack
, requests
, flask
, gevent
, pyzmq
}:
buildPythonPackage rec {
pname = "locustio";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61";
};
patchPhase = ''
sed -i s/"pyzmq=="/"pyzmq>="/ setup.py
'';
propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
buildInputs = [ mock unittest2 ];
meta = {
homepage = http://locust.io/;
description = "A load testing tool";
};
}
pkgs/development/python-modules/markdown2/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "markdown2";
version = "2.3.4";
version = "2.3.5";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/m/markdown2/${name}.zip";
sha256 = "264731e7625402227ff6fb01f2d814882da7705432659a18a419c508e8bfccb1";
sha256 = "8bb9a24eb2aa02f1427aabe46483f0f0215ab18c8a345315ae8e2ee3c3a09c03";
};
meta = with stdenv.lib; {
pkgs/development/python-modules/murmurhash/default.nix
+6 -5
View File
@@ -6,25 +6,26 @@
}:
buildPythonPackage rec {
name = "murmurhash-${version}";
pname = "murmurhash";
version = "0.26.4";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "explosion";
repo = "murmurhash";
rev = "0.26.4";
sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv";
sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv";
};
buildInputs = [
cython
];
checkPhase = ''
cd murmurhash/tests
${python.interpreter} -m unittest discover -p "*test*"
'';
meta = with stdenv.lib; {
description = "Cython bindings for MurmurHash2";
homepage = https://github.com/explosion/murmurhash;
pkgs/development/python-modules/natsort/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "natsort";
version = "5.1.0";
version = "5.1.1";
buildInputs = [
hypothesis
@@ -36,7 +36,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "5db0fd17c9f8ef3d54962a6e46159ce4807c630f0931169cd15ce54f2ac395b9";
sha256 = "9ffbfb74bf3fc3905be1b9b052ed865675651e38fcd972ed1ed5c64a02f93cbd";
};
# do not run checks on nix_run_setup.py
pkgs/development/python-modules/nilearn/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "nilearn";
version = "0.3.1";
name = "nilearn-${version}";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
pkgs/development/python-modules/nwdiag/default.nix
+4 -2
View File
@@ -3,11 +3,13 @@
}:
buildPythonPackage rec {
name = "nwdiag-1.0.3";
pname = "nwdiag";
version = "1.0.4";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys";
sha256 = "002565875559789a2dfc5f578c07abdf44269c3f7cdf78d4809bdc4bdc2213fa";
};
buildInputs = [ pep8 nose unittest2 docutils ];
pkgs/development/python-modules/parso/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "parso";
version = "0.1.0";
version = "0.1.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "c5279916bb417aa2bf634648ff895cf35dce371d7319744884827bfad06f8d7b";
sha256 = "5815f3fe254e5665f3c5d6f54f086c2502035cb631a91341591b5a564203cffb";
};
checkInputs = [ pytest ];
pkgs/development/python-modules/path.py/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "path.py";
version = "10.4";
name = "path.py-${version}";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
@@ -31,4 +31,4 @@ buildPythonPackage rec {
checkPhase = ''
py.test test_path.py
'';
}
}
pkgs/development/python-modules/phonenumbers/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.8.5";
version = "8.8.6";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "adb2dd985f875ac035bbdc6a1cc57e30834e106e2ff7899e09a1690b474c1774";
sha256 = "ab1fa853350dde91be672192b427169b29e3348c236e46ad7a757e4ac8163c8c";
};
meta = {
pkgs/development/python-modules/pip-tools/default.nix
+3 -3
View File
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "pip-tools";
version = "1.10.1";
name = "pip-tools-${version}";
version = "1.10.2";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
sha256 = "37b85d69ceed97337aeefb3e52e41fe0884a505c874757a5bbaa58d92b533ce0";
sha256 = "d381c7249eb48350cc49447cc106df3d90e9e806b13caaede602c1cd38f61b37";
};
LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/plaster-pastedeploy/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "plaster_pastedeploy";
version = "0.4.1";
version = "0.4.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1lrbkya5birfmg9gnfcnsa9id28klmjcqbm33rcg69pv9sfld4jv";
sha256 = "2a401228c7cfbe38f728249e75af7a666f91c61d642cbb8fcb78a71df69d2754";
};
checkPhase = ''
pkgs/development/python-modules/powerline/default.nix
+5 -3
View File
@@ -12,10 +12,12 @@
# the executables of git, mercurial and bazaar.
buildPythonPackage rec {
rev = "2.6";
name = "powerline-${rev}";
version = "2.6";
pname = "powerline";
name = pname + "-" + version;
src = fetchurl {
url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
url = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
name = "${name}.tar.gz";
sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272";
};
pkgs/development/python-modules/protobuf/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
with stdenv.lib;
buildPythonPackage rec {
inherit (protobuf) name src;
inherit (protobuf) name src version;
inherit disabled doCheck;
NIX_CFLAGS_COMPILE =
pkgs/development/python-modules/psutil/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, darwin
, mock
}:
buildPythonPackage rec {
pname = "psutil";
version = "5.4.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "42e2de159e3c987435cb3b47d6f37035db190a1499f3af714ba7af5c379b6ba2";
};
# No tests in archive
doCheck = false;
buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit ];
meta = {
description = "Process and system utilization information interface for python";
homepage = https://github.com/giampaolo/psutil;
license = stdenv.lib.licenses.bsd3;
};
}
pkgs/development/python-modules/pwntools/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
version = "3.10.0";
pname = "pwntools";
name = "pwntools-${version}";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
pkgs/development/python-modules/pyGithub/default.nix
+2 -1
View File
@@ -3,8 +3,9 @@
, buildPythonPackage, python-jose }:
buildPythonPackage rec {
name = "PyGithub-${version}";
pname = "PyGithub";
version = "1.32";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "PyGithub";
pkgs/development/python-modules/pychromecast/default.nix
+2 -1
View File
@@ -1,8 +1,9 @@
{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
buildPythonPackage rec {
name = "PyChromecast-${version}";
pname = "PyChromecast";
version = "0.8.1";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/p/pychromecast/${name}.tar.gz";
pkgs/development/python-modules/pycrypto/default.nix
+1 -2
View File
@@ -3,10 +3,9 @@
# This is a dummy package providing the drop-in replacement pycryptodome.
# https://github.com/NixOS/nixpkgs/issues/21671
let
buildPythonPackage rec {
version = pycryptodome.version;
pname = "pycrypto";
in buildPythonPackage rec {
name = "${pname}-${version}";
# Cannot build wheel otherwise (zip 1980 issue)
pkgs/development/python-modules/pycuda/compyte.nix
+5 -4
View File
@@ -1,10 +1,11 @@
{ mkDerivation
{ mkDerivation
, fetchFromGitHub
}:
mkDerivation rec {
name = "compyte-${version}";
version = "git-20150817";
pname = "compyte";
version = "git-20150817";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "inducer";
@@ -13,7 +14,7 @@ mkDerivation rec {
sha256 = "1980h017qi52b7fqwm75m481xs2napgdd3fbrzkfc29k085cbign";
};
installPhase = ''
installPhase = ''
mkdir -p $out
cp -r * $out
'';
pkgs/development/python-modules/pyev/default.nix
+3 -1
View File
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, libev }:
buildPythonPackage rec {
name = "pyev-0.9.0";
pname = "pyev";
version = "0.9.0";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://pypi/p/pyev/${name}.tar.gz";
pkgs/development/python-modules/pyftgl/default.nix
+5 -3
View File
@@ -2,12 +2,14 @@
, boost, freetype, ftgl, mesa }:
buildPythonPackage rec {
name = "pyftgl-0.4b";
pname = "pyftgl";
version = "0.4b";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "umlaeute";
repo = "pyftgl";
rev = "0.4b";
repo = name;
rev = version;
sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
};
pkgs/development/python-modules/pygame/git.nix
+2 -1
View File
@@ -3,8 +3,9 @@
}:
buildPythonPackage rec {
name = "pygame-${version}";
pname = "pygame";
version = "2016-05-17";
name = pname + "-" + version;
src = fetchFromBitbucket {
owner = "pygame";
pkgs/development/python-modules/pygobject/3.nix
+3 -1
View File
@@ -3,8 +3,10 @@
buildPythonPackage rec {
major = "3.24";
minor = "1";
name = "pygobject-${major}.${minor}";
version = "${major}.${minor}";
format = "other";
pname = "pygobject";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
pkgs/development/python-modules/pygobject/default.nix
+2 -1
View File
@@ -1,9 +1,10 @@
{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }:
buildPythonPackage rec {
name = "pygobject-${version}";
pname = "pygobject";
version = "2.28.6";
format = "other";
name = pname + "-" + version;
src = fetchurl {
url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";
pkgs/development/python-modules/pygtk/default.nix
+3 -1
View File
@@ -2,7 +2,9 @@
, buildPythonPackage, libglade ? null, isPy3k }:
buildPythonPackage rec {
name = "pygtk-2.24.0";
pname = "pygtk";
version = "2.24.0";
name = pname + "-" + version;
disabled = isPy3k;
pkgs/development/python-modules/pygtksourceview/default.nix
+4 -4
View File
@@ -1,10 +1,10 @@
{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
let version = "2.10.1"; in
buildPythonPackage {
name = "pygtksourceview-${version}";
buildPythonPackage rec {
pname = "pygtksourceview";
format = "other";
version = "2.10.1";
name = pname + "-" + version;
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";
pkgs/development/python-modules/pyocr/default.nix
+2 -1
View File
@@ -3,8 +3,9 @@
}:
buildPythonPackage rec {
name = "pyocr-${version}";
pname = "pyocr";
version = "0.4.7";
name = pname + "-" + version;
# Don't fetch from PYPI because it doesn't contain tests.
src = fetchFromGitHub {
pkgs/development/python-modules/pyqt/4.x.nix
+5 -1
View File
@@ -1,10 +1,14 @@
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
let
pname = "PyQt-x11-gpl";
version = "4.12";
inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage {
name = "PyQt-x11-gpl-${version}";
pname = pname;
name = pname + "-" + version;
version = version;
format = "other";
src = fetchurl {
pkgs/development/python-modules/pyqt/5.x.nix
+5 -1
View File
@@ -5,11 +5,15 @@
}:
let
pname = "PyQt";
version = "5.9";
inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage {
name = "PyQt-${version}";
pname = pname;
version = version;
format = "other";
name = pname + "-" + version;
meta = with lib; {
description = "Python bindings for Qt5";
pkgs/development/python-modules/pyro/default.nix
+4 -1
View File
@@ -1,7 +1,10 @@
{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
buildPythonPackage rec {
name = "Pyro-3.16";
pname = "Pyro";
version = "3.16";
name = pname + "-" + version;
disabled = isPy3k;
src = fetchurl {
pkgs/development/python-modules/pyslurm/default.nix
+3 -1
View File
@@ -1,7 +1,9 @@
{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }:
buildPythonPackage rec {
name = "pyslurm";
pname = "pyslurm";
version = "unstable-69e4f4f";
name = pname + "-" + version;
src = fetchFromGitHub {
repo = "pyslurm";
pkgs/development/python-modules/pysoundfile/default.nix
+2 -2
View File
@@ -11,8 +11,8 @@
buildPythonPackage rec {
pname = "PySoundFile";
name = "PySoundFile-${version}";
version = "0.8.1";
name = pname + "-" + version;
src = fetchPypi {
inherit pname version;
@@ -35,4 +35,4 @@ buildPythonPackage rec {
# https://github.com/bastibe/PySoundFile/issues/157
disabled = isPyPy || stdenv.isi686;
}
}

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