Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
462b971ec1
|
@ -22,7 +22,7 @@ with import <stockholm/lib>;
|
||||||
user = config.krebs.users.makefu;
|
user = config.krebs.users.makefu;
|
||||||
source = let
|
source = let
|
||||||
inherit (config.krebs.build) host user;
|
inherit (config.krebs.build) host user;
|
||||||
ref = "0afb6d7"; # unstable @ 2017-05-09
|
ref = "a772c3a"; # unstable @ 2017-05-09 + graceful requests2
|
||||||
in {
|
in {
|
||||||
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
https://api.github.com/repos/dorimanx/exfat-nofuse/commits
|
https://api.github.com/repos/dorimanx/exfat-nofuse/commits
|
||||||
https://api.github.com/repos/dorimanx/exfat-nofuse/tags
|
https://api.github.com/repos/dorimanx/exfat-nofuse/tags
|
||||||
https://api.github.com/repos/radare/radare2/tags
|
https://api.github.com/repos/radare/radare2/tags
|
||||||
|
https://api.github.com/repos/rapid7/metasploit-framework/tags
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ with python3Packages; buildPythonPackage rec {
|
||||||
name = "acdcli-${version}";
|
name = "acdcli-${version}";
|
||||||
version = "0.3.2";
|
version = "0.3.2";
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
dateutil colorama fusepy appdirs requests2 requests_toolbelt six
|
dateutil colorama fusepy appdirs requests requests_toolbelt six
|
||||||
];
|
];
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://pypi/a/acdcli/${name}.tar.gz";
|
url = "mirror://pypi/a/acdcli/${name}.tar.gz";
|
||||||
|
|
|
@ -10,7 +10,7 @@ pkgs.python3Packages.buildPythonPackage rec {
|
||||||
sha256 = "1401saisk98n5wgw73nwh8hb484vayw5c6dlypxc1fp4ybym4zi9";
|
sha256 = "1401saisk98n5wgw73nwh8hb484vayw5c6dlypxc1fp4ybym4zi9";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [ requests2 ];
|
propagatedBuildInputs = with pkgs.python3Packages; [ requests ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Simple BinTray utility for uploading packages";
|
description = "Simple BinTray utility for uploading packages";
|
||||||
|
|
|
@ -56,7 +56,7 @@ let
|
||||||
sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
|
sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [ requests2 py ];
|
propagatedBuildInputs = with pkgs.python3Packages; [ requests py ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = https://bitbucket.org/hpk42/devpi;
|
homepage = https://bitbucket.org/hpk42/devpi;
|
||||||
|
|
|
@ -16,7 +16,7 @@ in buildPythonPackage rec {
|
||||||
version = "1.0.5";
|
version = "1.0.5";
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
flask
|
flask
|
||||||
requests2
|
requests
|
||||||
ftputil
|
ftputil
|
||||||
redis
|
redis
|
||||||
];
|
];
|
||||||
|
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
lxml
|
lxml
|
||||||
pytz
|
pytz
|
||||||
redis
|
redis
|
||||||
requests2
|
requests
|
||||||
];
|
];
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shackspace";
|
owner = "shackspace";
|
||||||
|
|
|
@ -11,7 +11,7 @@ with import <stockholm/lib>;
|
||||||
nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
|
nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix";
|
||||||
nixpkgs.git = {
|
nixpkgs.git = {
|
||||||
url = https://github.com/NixOS/nixpkgs;
|
url = https://github.com/NixOS/nixpkgs;
|
||||||
ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-03
|
ref = "22da5d02466ffe465735986d705675982f3646a0"; # nixos-17.03 @ 2017-05-13
|
||||||
};
|
};
|
||||||
secrets.file =
|
secrets.file =
|
||||||
if getEnv "dummy_secrets" == "true"
|
if getEnv "dummy_secrets" == "true"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user