Skip to content

Commit

Permalink
pypi2nix: 1.3.0 -> 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
garbas committed Aug 15, 2016
1 parent b5194d7 commit c29e760
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
21 changes: 6 additions & 15 deletions pkgs/development/tools/pypi2nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,17 @@

let
deps = import ./deps.nix { inherit fetchurl; };
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8";
sha256 = "0pkm93lg7i2chcw59bm5yv09qwcq3wifk8hgr6i3dvv20mifbndr";

};
in stdenv.mkDerivation rec {
name = "pypi2nix-${version}";
srcs = with deps; [
src
pip
click
setuptools
zcbuildout
zcrecipeegg
requests
]; # six attrs effect ];
buildInputs = [ python zip makeWrapper ];
Expand All @@ -26,17 +22,13 @@ in stdenv.mkDerivation rec {
postUnpack = ''
mkdir -p $out/pkgs
mv pip-*/pip $out/pkgs/pip
mv click-*/click $out/pkgs/click
mv setuptools-*/setuptools $out/pkgs/setuptools
mv zc.buildout-*/src/zc $out/pkgs/zc
mv zc.recipe.egg-*/src/zc/recipe $out/pkgs/zc/recipe
# mv six-*/six.py $out/pkgs/
# mv attrs-*/src/attr $out/pkgs/attrs
# mv effect-*/effect $out/pkgs/effect
mv requests-*/requests $out/pkgs/
if [ -z "$IN_NIX_SHELL" ]; then
if [ "$IN_NIX_SHELL" != "1" ]; then
if [ -e git-export ]; then
mv git-export/src/pypi2nix $out/pkgs/pypi2nix
else
Expand All @@ -48,9 +40,9 @@ in stdenv.mkDerivation rec {
commonPhase = ''
mkdir -p $out/bin
echo "#!${python}/bin/python3" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
echo "#!${python.interpreter}" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
chmod +x $out/bin/pypi2nix
Expand Down Expand Up @@ -81,6 +73,5 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/garbas/pypi2nix;
description = "A tool that generates nix expressions for your python packages, so you don't have to.";
maintainers = with stdenv.lib.maintainers; [ garbas ];
platforms = with stdenv.lib.platforms; unix;
};
}
8 changes: 8 additions & 0 deletions pkgs/development/tools/pypi2nix/deps.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ rec {
zcrecipeeggVersion = "2.0.3";
zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";

buildoutrequirementsVersion = "0.2.2";
buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00";

wheelVersion = "0.29.0";
wheelHash = "555a67e4507cedee23a0deb9651e452f";

Expand Down Expand Up @@ -71,6 +74,11 @@ rec {
md5 = zcrecipeeggHash;
};

buildoutrequirements = fetchurl {
url = "https://github.com/garbas/buildout.requirements/archive/1e2977e2d254184399401746736d2b17c912b350.tar.gz";
md5 = buildoutrequirementsHash;
};

wheel = fetchurl {
url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-${wheelVersion}.tar.gz";
md5 = wheelHash;
Expand Down

0 comments on commit c29e760

Please sign in to comment.