Commit 60f31c60 authored by Rok Garbas's avatar Rok Garbas Committed by GitHub
Browse files

pypi2nix: 1.4.0 -> 1.5.0 (#18941)

parent 88855188

pkgs/development/tools/pypi2nix/default.nix

+17 −8
Original line number Diff line number Diff line
@@ -2,19 +2,31 @@ 
}:



let

  deps = import ./deps.nix { inherit fetchurl; };

  version = "1.4.0";



  version = "1.5.0";



  src = fetchurl {

    url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";

    sha256 = "0w5f10p4d4ppwg2plbbrmqwmi1ycgpaidyajza11c9svka014zrb";

    sha256 = "0s79pp7gkgyk7discnv94m6z81fd67p66rdbd4cwk1ma0qljlh2k";

  };



  click = fetchurl {

    url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";

    sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";

  };



  requests = fetchurl {

    url = "https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz";

    sha256 = "0cx1w7m4cpslxz9jljxv0l9892ygrrckkiwpp2hangr8b01rikss";

  };



in stdenv.mkDerivation rec {

  name = "pypi2nix-${version}";

  srcs = with deps; [

  srcs = [

    src

    click

    requests

  ];  # six attrs effect ];

  ];

  buildInputs = [ python zip makeWrapper ];

  sourceRoot = ".";
@@ -22,9 +34,6 @@ in stdenv.mkDerivation rec { 
    mkdir -p $out/pkgs



    mv click-*/click                    $out/pkgs/click

    # 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 [ "$IN_NIX_SHELL" != "1" ]; then

pkgs/development/tools/pypi2nix/deps.nix

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
{ fetchurl

}:



rec {



  pipVersion = "8.1.2";

  pipHash = "87083c0b9867963b29f7aba3613e8f4a";

  pipWhlHash = "0570520434c5b600d89ec95393b2650b";



  setuptoolsVersion = "23.0.0";

  setuptoolsHash = "100a90664040f8ff232fbac02a4c5652";

  setuptoolsWhlHash = "a066fd7bfb8faaad763acbdbcb290199";



  zcbuildoutVersion = "2.5.2";

  zcbuildoutHash = "06a21fb02528c07aa0db31de0389a244";



  zcrecipeeggVersion = "2.0.3";

  zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4";



  buildoutrequirementsVersion = "0.2.2";

  buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00";



  wheelVersion = "0.29.0";

  wheelHash = "555a67e4507cedee23a0deb9651e452f";



  clickVersion = "6.6";

  clickHash = "d0b09582123605220ad6977175f3e51d";



  sixVersion = "1.10.0";

  sixHash = "34eed507548117b2ab523ab14b2f8b55";



  attrsVersion = "16.0.0";

  attrsHash = "5bcdd418f6e83e580434c63067c08a73";



  effectVersion = "0.10.1";

  effectHash = "6a6fd28fb44179ce01a148d4e8bdbede";



  requestsVersion = "2.10.0";

  requestsHash = "a36f7a64600f1bfec4d55ae021d232ae";





  # --- wheels used to bootstrap python environment ---------------------------



  pipWhl = fetchurl {

    url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${pipVersion}-py2.py3-none-any.whl";

    md5 = pipWhlHash;

  };



  setuptoolsWhl = fetchurl {

    url = "https://pypi.python.org/packages/74/7c/c75c4f4032a4627406db06b742cdc7ba24c4833cd423ea7e22882380abde/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl";

    md5 = setuptoolsWhlHash;

  };





  # --- python packages needed ------------------------------------------------



  pip = fetchurl {

    url = "https://pypi.python.org/packages/e7/a8/7556133689add8d1a54c0b14aeff0acb03c64707ce100ecd53934da1aa13/pip-${pipVersion}.tar.gz";

    md5 = pipHash;

  };



  setuptools = fetchurl {

    url = "https://pypi.python.org/packages/45/5e/79ca67a0d6f2f42bfdd9e467ef97398d6ad87ee2fa9c8cdf7caf3ddcab1e/setuptools-${setuptoolsVersion}.tar.gz";

    md5 = setuptoolsHash;

  };



  zcbuildout = fetchurl {

    url = "https://pypi.python.org/packages/ec/a1/60214738d5dcb199ad97034ecf349d18f3ab69659df827a5e182585bfe48/zc.buildout-${zcbuildoutVersion}.tar.gz";

    md5 = zcbuildoutHash;

  };



  zcrecipeegg = fetchurl {

    url = "https://pypi.python.org/packages/08/5e/ade683d229d77ed457017145672f1be4fd98be60f1a5344109a4e66a7d54/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz";

    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;

  };



  click = fetchurl {

    url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-${clickVersion}.tar.gz";

    md5 = clickHash;

  };



  # six = fetchurl {

  #   url = "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-${sixVersion}.tar.gz";

  #   md5 = sixHash;

  # };



  # attrs = fetchurl {

  #   url = "https://pypi.python.org/packages/89/15/80d388d696c8c8ba14874635207aa698eb30ef1242dbb54d9eccf0e927ff/attrs-${attrsVersion}.tar.gz";

  #   md5 = attrsHash;

  # };



  # effect = fetchurl {

  #   url = "https://pypi.python.org/packages/09/19/bd92fe0ba6080323caffd450db65ac7a5bb2d71d9b61fe6a2751a9c3292c/effect-${effectVersion}.tar.gz";

  #   md5 = effectHash;

  # };



  requests = fetchurl {

    url = "https://pypi.python.org/packages/49/6f/183063f01aae1e025cf0130772b55848750a2f3a89bfa11b385b35d7329d/requests-${requestsVersion}.tar.gz";

    md5 = requestsHash;

  };



}