Skip to content
This repository was archived by the owner on Oct 7, 2022. It is now read-only.

Commit 8c38b77

Browse files
committed
updating dependencies
1 parent 4f6ca8a commit 8c38b77

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
let
66

7+
version = builtins.readFile ./src/pypi2nix/VERSION;
8+
79
click = fetchurl {
810
url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
911
sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
1012
};
1113

1214
requests = fetchurl {
13-
url = "https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz";
14-
sha256 = "0cx1w7m4cpslxz9jljxv0l9892ygrrckkiwpp2hangr8b01rikss";
15+
url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
16+
sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
1517
};
1618

17-
version = builtins.readFile ./src/pypi2nix/VERSION;
18-
1919
in stdenv.mkDerivation rec {
2020
name = "pypi2nix-${version}";
2121
srcs = [

examples/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ awscli_and_requests-clear:
167167
vulnix: vulnix-clear $(PYPI2NIX)
168168
@echo "building and testing vulnix..."
169169
@git clone https://github.com/garbas/vulnix vulnix-src
170-
@cd vulnix-src && ./../$(PYPI2NIX) -V 3.5 -b buildout.cfg -e pytest-runner -e setuptools-scm -v -I $(NIX_PATH)
170+
@cd vulnix-src && nix-shell update.nix --argstr pypi2nix "./../$(PYPI2NIX)"
171171
@NIX_PATH=$(NIX_PATH) nix-build vulnix-src/default.nix --arg pkgs "import <nixpkgs> {}" -o vulnix
172172
@./vulnix/bin/vulnix --help
173173

examples/vulnix_override.nix

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/pypi2nix/deps.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ rec {
1313
sha256 = "03clr9c1dih5n9c00c592zzvf6r1ffimywkaq9agcqdllzhl7wh9";
1414
};
1515

16-
setuptoolsVersion = "29.0.0";
16+
setuptoolsVersion = "32.2.0";
1717
setuptoolsWhl = fetchurl {
18-
url = "https://pypi.python.org/packages/5b/22/ee2f999f9fc1ce934b523852bd7c1ea12e0f0fa1de19317135a0d1159507/setuptools-29.0.0-py2.py3-none-any.whl";
19-
sha256 = "15bs20dxcigj2jqngp6kjpicr8w6f2xb81qa36wxprznsfk8j251";
18+
url = "https://pypi.python.org/packages/3a/fb/570e51a1a4b0de85eb6ec36a6c47bd5fd7a55128a1391a15b6e21d290a87/setuptools-32.2.0-py2.py3-none-any.whl";
19+
sha256 = "1pyszj1bzp73dj2anpr37106bimpwyj6kqgigw0gahl7dgyzk3p1";
2020
};
2121

2222
zcbuildoutVersion = "2.5.3";

0 commit comments

Comments
 (0)