Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2020-02-19 09:25:40 +01:00
commit b1cca61300
52 changed files with 1016 additions and 385 deletions

3
.github/CODEOWNERS vendored
View File

@ -31,6 +31,9 @@
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch
# NixOS Internals
/nixos/default.nix @nbp @infinisil
/nixos/lib/from-env.nix @nbp @infinisil

View File

@ -911,7 +911,7 @@ def subtest(name: str) -> Iterator[None]:
if __name__ == "__main__":
log = Logger()
vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split()))
vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split()))
vde_sockets = [create_vlan(v) for v in vlan_nrs]
for nr, vde_socket, _, _ in vde_sockets:
os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket

View File

@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/0q5qnh10m2sfrriszc1ysmggw659q6qm-nix-2.3.2";
i686-linux = "/nix/store/i7ad7r5d8a5b3l22hg4a1im2qq05y6vd-nix-2.3.2";
aarch64-linux = "/nix/store/bv06pavfw0dbqzr8w3l7s71nx27gnxa0-nix-2.3.2";
x86_64-darwin = "/nix/store/x6mnl1nij7y4v5ihlplr4k937ayr403r-nix-2.3.2";
x86_64-linux = "/nix/store/68mycwwczrciryylq2a66jwfhxp09zsg-nix-2.3.3-debug";
i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3";
aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3";
x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3";
}

View File

@ -820,6 +820,7 @@
./services/web-apps/icingaweb2/icingaweb2.nix
./services/web-apps/icingaweb2/module-monitoring.nix
./services/web-apps/ihatemoney
./services/web-apps/jirafeau.nix
./services/web-apps/limesurvey.nix
./services/web-apps/mattermost.nix
./services/web-apps/mediawiki.nix

View File

@ -162,9 +162,8 @@ in
# This file is read for all shells.
# Only execute this file once per shell.
# But don't clobber the environment of interactive non-login children!
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
__ETC_ZSHENV_SOURCED=1
if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
. ${config.system.build.setEnvironment}

View File

@ -0,0 +1,169 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.jirafeau;
group = config.services.nginx.group;
user = config.services.nginx.user;
withTrailingSlash = str: if hasSuffix "/" str then str else "${str}/";
localConfig = pkgs.writeText "config.local.php" ''
<?php
$cfg['admin_password'] = '${cfg.adminPasswordSha256}';
$cfg['web_root'] = 'http://${withTrailingSlash cfg.hostName}';
$cfg['var_root'] = '${withTrailingSlash cfg.dataDir}';
$cfg['maximal_upload_size'] = ${builtins.toString cfg.maxUploadSizeMegabytes};
$cfg['installation_done'] = true;
${cfg.extraConfig}
'';
in
{
options.services.jirafeau = {
adminPasswordSha256 = mkOption {
type = types.str;
default = "";
description = ''
SHA-256 of the desired administration password. Leave blank/unset for no password.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/jirafeau/data/";
description = "Location of Jirafeau storage directory.";
};
enable = mkEnableOption "Jirafeau file upload application.";
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
$cfg['style'] = 'courgette';
$cfg['organisation'] = 'ACME';
'';
description = let
documentationLink =
"https://gitlab.com/mojo42/Jirafeau/-/blob/${cfg.package.version}/lib/config.original.php";
in
''
Jirefeau configuration. Refer to <link xlink:href="${documentationLink}"/> for supported
values.
'';
};
hostName = mkOption {
type = types.str;
default = "localhost";
description = "URL of instance. Must have trailing slash.";
};
maxUploadSizeMegabytes = mkOption {
type = types.int;
default = 0;
description = "Maximum upload size of accepted files.";
};
maxUploadTimeout = mkOption {
type = types.str;
default = "30m";
description = let
nginxCoreDocumentation = "http://nginx.org/en/docs/http/ngx_http_core_module.html";
in
''
Timeout for reading client request bodies and headers. Refer to
<link xlink:href="${nginxCoreDocumentation}#client_body_timeout"/> and
<link xlink:href="${nginxCoreDocumentation}#client_header_timeout"/> for accepted values.
'';
};
nginxConfig = mkOption {
type = types.submodule
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
default = {};
example = {
serverAliases = [ "wiki.\${config.networking.domain}" ];
};
description = "Extra configuration for the nginx virtual host of Jirafeau.";
};
package = mkOption {
type = types.package;
default = pkgs.jirafeau;
defaultText = "pkgs.jirafeau";
description = "Jirafeau package to use";
example = "pkgs.jirafeau";
};
poolConfig = mkOption {
type = with types; attrsOf (oneOf [ str int bool ]);
default = {
"pm" = "dynamic";
"pm.max_children" = 32;
"pm.start_servers" = 2;
"pm.min_spare_servers" = 2;
"pm.max_spare_servers" = 4;
"pm.max_requests" = 500;
};
description = ''
Options for Jirafeau PHP pool. See documentation on <literal>php-fpm.conf</literal> for
details on configuration directives.
'';
};
};
config = mkIf cfg.enable {
services = {
nginx = {
enable = true;
virtualHosts."${cfg.hostName}" = mkMerge [
cfg.nginxConfig
{
extraConfig = let
clientMaxBodySize =
if cfg.maxUploadSizeMegabytes == 0 then "0" else "${cfg.maxUploadSizeMegabytes}m";
in
''
index index.php;
client_max_body_size ${clientMaxBodySize};
client_body_timeout ${cfg.maxUploadTimeout};
client_header_timeout ${cfg.maxUploadTimeout};
'';
locations = {
"~ \\.php$".extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket};
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
'';
};
root = mkForce "${cfg.package}";
}
];
};
phpfpm.pools.jirafeau = {
inherit group user;
phpEnv."JIRAFEAU_CONFIG" = "${localConfig}";
settings = {
"listen.mode" = "0660";
"listen.owner" = user;
"listen.group" = group;
} // cfg.poolConfig;
};
};
systemd.tmpfiles.rules = [
"d ${cfg.dataDir} 0750 ${user} ${group} - -"
"d ${cfg.dataDir}/files/ 0750 ${user} ${group} - -"
"d ${cfg.dataDir}/links/ 0750 ${user} ${group} - -"
"d ${cfg.dataDir}/async/ 0750 ${user} ${group} - -"
];
};
}

View File

@ -137,6 +137,7 @@ in
jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {};
jenkins = handleTest ./jenkins.nix {};
jirafeau = handleTest ./jirafeau.nix {};
kafka = handleTest ./kafka.nix {};
keepalived = handleTest ./keepalived.nix {};
kerberos = handleTest ./kerberos/default.nix {};

22
nixos/tests/jirafeau.nix Normal file
View File

@ -0,0 +1,22 @@
import ./make-test-python.nix ({ lib, ... }:
with lib;
{
name = "jirafeau";
meta.maintainers = with maintainers; [ davidtwco ];
nodes.machine = { pkgs, ... }: {
services.jirafeau = {
enable = true;
};
};
testScript = ''
machine.start()
machine.wait_for_unit("phpfpm-jirafeau.service")
machine.wait_for_unit("nginx.service")
machine.wait_for_open_port(80)
machine.succeed("curl -sSfL http://localhost/ | grep 'Jirafeau'")
'';
})

View File

@ -3,7 +3,7 @@
pkgs ? import ../.. { inherit system config; }
}:
with import ../lib/testing.nix { inherit system pkgs; };
with import ../lib/testing-python.nix { inherit system pkgs; };
let
output = runInMachine {

View File

@ -36,7 +36,7 @@
, libmypaint
, gexiv2
, harfbuzz
, mypaint-brushes
, mypaint-brushes1
, libwebp
, libheif
, libgudev
@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
xorg.libXpm
glib-networking
libmypaint
mypaint-brushes
mypaint-brushes1
] ++ lib.optionals stdenv.isDarwin [
AppKit
Cocoa

View File

@ -7,59 +7,81 @@
, libpng
, librsvg
, gobject-introspection
, libmypaint
, mypaint-brushes
, gdk-pixbuf
, pkgconfig
, python2
, scons
, python3
, swig
, wrapGAppsHook
}:
let
inherit (python2.pkgs) pycairo pygobject3 numpy;
in stdenv.mkDerivation {
inherit (python3.pkgs) pycairo pygobject3 numpy buildPythonApplication;
in buildPythonApplication rec {
pname = "mypaint";
version = "1.2.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "mypaint";
repo = "mypaint";
rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f";
sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf";
rev = "v${version}";
sha256 = "180kyilhf81ndhwl1hlvy82gh6hxpcvka2d1nkghbpgy431rls6r";
fetchSubmodules = true;
};
nativeBuildInputs = [
intltool
pkgconfig
scons
swig
wrapGAppsHook
gobject-introspection # for setup hook
];
buildInputs = [
gtk3
gdk-pixbuf
libmypaint
mypaint-brushes
json_c
lcms2
libpng
librsvg
pycairo
pygobject3
python2
];
propagatedBuildInputs = [
numpy
pycairo
pygobject3
];
postInstall = ''
sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint
checkInputs = [
gtk3
];
buildPhase = ''
runHook preBuild
${python3.interpreter} setup.py build
runHook postBuild
'';
preFixup = ''
gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH)
installPhase = ''
runHook preInstall
${python3.interpreter} setup.py managed_install --prefix=$out
runHook postInstall
'';
checkPhase = ''
runHook preCheck
HOME=$TEMPDIR ${python3.interpreter} setup.py test
runHook postCheck
'';
meta = with stdenv.lib; {

View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, qtbase }:
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }:
stdenv.mkDerivation rec {
pname = "rclone-browser";
version = "1.2";
version = "1.8.0";
src = fetchFromGitHub {
owner = "mmozeiko";
owner = "kapitainsky";
repo = "RcloneBrowser";
rev = version;
sha256 = "1ldradd5c606mfkh46y4mhcvf9kbjhamw0gahksp9w43h5dh3ir7";
sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ qtbase ];

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
description = "Libraries required for the higher-level Qubes daemons and tools";
homepage = "https://qubes-os.org";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ "0x4A6F" ];
maintainers = [ maintainers."0x4A6F" ];
platforms = platforms.linux;
};
}

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A lightweight and efficient window manager for X11";
homepage = "https://github.com/leahneukirchen/cwm";
maintainers = with maintainers; [ "0x4A6F" mkf ];
maintainers = with maintainers; [ maintainers."0x4A6F" mkf ];
license = licenses.isc;
platforms = platforms.linux;
};

View File

@ -25,7 +25,7 @@ commitDateStrict8601=
if test -n "$deepClone"; then
deepClone=true
else
deepClone=false
deepClone=
fi
if test "$leaveDotGit" != 1; then
@ -53,6 +53,11 @@ Options:
exit 1
}
# some git commands print to stdout, which would contaminate our JSON output
clean_git(){
git "$@" >&2
}
argi=0
argfun=""
for arg; do
@ -65,7 +70,7 @@ for arg; do
--branch-name) argfun=set_branchName;;
--deepClone) deepClone=true;;
--quiet) QUIET=true;;
--no-deepClone) deepClone=false;;
--no-deepClone) deepClone=;;
--leave-dotGit) leaveDotGit=true;;
--fetch-submodules) fetchSubmodules=true;;
--builder) builder=true;;
@ -98,9 +103,9 @@ fi
init_remote(){
local url=$1
git init
git remote add origin "$url"
( [ -n "$http_proxy" ] && git config http.proxy "$http_proxy" ) || true
clean_git init
clean_git remote add origin "$url"
( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true
}
# Return the reference of an hash if it exists on the remote repository.
@ -141,8 +146,8 @@ checkout_hash(){
hash=$(hash_from_ref "$ref")
fi
git fetch -t ${builder:+--progress} origin || return 1
git checkout -b "$branchName" "$hash" || return 1
clean_git fetch -t ${builder:+--progress} origin || return 1
clean_git checkout -b "$branchName" "$hash" || return 1
}
# Fetch only a branch/tag and checkout it.
@ -150,7 +155,7 @@ checkout_ref(){
local hash="$1"
local ref="$2"
if "$deepClone"; then
if [[ -n "$deepClone" ]]; then
# The caller explicitly asked for a deep clone. Deep clones
# allow "git describe" and similar tools to work. See
# https://marc.info/?l=nix-dev&m=139641582514772
@ -164,8 +169,8 @@ checkout_ref(){
if test -n "$ref"; then
# --depth option is ignored on http repository.
git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
git checkout -b "$branchName" FETCH_HEAD || return 1
clean_git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
clean_git checkout -b "$branchName" FETCH_HEAD || return 1
else
return 1
fi
@ -174,7 +179,7 @@ checkout_ref(){
# Update submodules
init_submodules(){
# Add urls into .git/config file
git submodule init
clean_git submodule init
# list submodule directories and their hashes
git submodule status |
@ -248,7 +253,7 @@ make_deterministic_repo(){
# Remove all remote branches.
git branch -r | while read -r branch; do
git branch -rD "$branch" >&2
clean_git branch -rD "$branch"
done
# Remove tags not reachable from HEAD. If we're exactly on a tag, don't
@ -256,19 +261,19 @@ make_deterministic_repo(){
maybe_tag=$(git tag --points-at HEAD)
git tag --contains HEAD | while read -r tag; do
if [ "$tag" != "$maybe_tag" ]; then
git tag -d "$tag" >&2
clean_git tag -d "$tag"
fi
done
# Do a full repack. Must run single-threaded, or else we lose determinism.
git config pack.threads 1
git repack -A -d -f
clean_git config pack.threads 1
clean_git repack -A -d -f
rm -f .git/config
# Garbage collect unreferenced objects.
# Note: --keep-largest-pack prevents non-deterministic ordering of packs
# listed in .git/objects/info/packs by only using a single pack
git gc --prune=all --keep-largest-pack
clean_git gc --prune=all --keep-largest-pack
)
}
@ -369,7 +374,9 @@ print_results() {
"rev": "$(json_escape "$fullRev")",
"date": "$(json_escape "$commitDateStrict8601")",
"$(json_escape "$hashType")": "$(json_escape "$hash")",
"fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false)
"fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false),
"deepClone": $([[ -n "$deepClone" ]] && echo true || echo false),
"leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false)
}
EOF
fi

View File

@ -234,17 +234,48 @@ rec {
'';
/*
* Create a forest of symlinks to the files in `paths'.
*
* Examples:
* # adds symlinks of hello to current build.
* { symlinkJoin, hello }:
* symlinkJoin { name = "myhello"; paths = [ hello ]; }
*
* # adds symlinks of hello to current build and prints "links added"
* { symlinkJoin, hello }:
* symlinkJoin { name = "myhello"; paths = [ hello ]; postBuild = "echo links added"; }
*/
* Create a forest of symlinks to the files in `paths'.
*
* This creates a single derivation that replicates the directory structure
* of all the input paths.
*
* Examples:
* # adds symlinks of hello to current build.
* symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; }
*
* # adds symlinks of hello and stack to current build and prints "links added"
* symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; }
*
* This creates a derivation with a directory structure like the following:
*
* /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample
* |-- bin
* | |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello
* | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack
* `-- share
* |-- bash-completion
* | `-- completions
* | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack
* |-- fish
* | `-- vendor_completions.d
* | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish
* ...
*
* symlinkJoin and linkFarm are similar functions, but they output
* derivations with different structure.
*
* symlinkJoin is used to create a derivation with a familiar directory
* structure (top-level bin/, share/, etc), but with all actual files being symlinks to
* the files in the input derivations.
*
* symlinkJoin is used many places in nixpkgs to create a single derivation
* that appears to contain binaries, libraries, documentation, etc from
* multiple input derivations.
*
* linkFarm is instead used to create a simple derivation with symlinks to
* other derivations. A derivation created with linkFarm is often used in CI
* as a easy way to build multiple derivations at once.
*/
symlinkJoin =
args_@{ name
, paths
@ -268,6 +299,60 @@ rec {
${postBuild}
'';
/*
* Quickly create a set of symlinks to derivations.
*
* This creates a simple derivation with symlinks to all inputs.
*
* entries is a list of attribute sets like
* { name = "name" ; path = "/nix/store/..."; }
*
* Example:
*
* # Symlinks hello and stack paths in store to current $out/hello-test and
* # $out/foobar.
* linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ]
*
* This creates a derivation with a directory structure like the following:
*
* /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample
* |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1
* `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10
*
* See the note on symlinkJoin for the difference between linkFarm and symlinkJoin.
*/
linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
''mkdir -p $out
cd $out
${lib.concatMapStrings (x: ''
mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name}
'') entries}
'';
/*
* Easily create a linkFarm from a set of derivations.
*
* This calls linkFarm with a list of entries created from the list of input
* derivations. It turns each input derivation into an attribute set
* like { name = drv.name ; path = drv }, and passes this to linkFarm.
*
* Example:
*
* # Symlinks the hello, gcc, and ghc derivations in $out
* linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ]
*
* This creates a derivation with a directory structure like the following:
*
* /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample
* |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0
* |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5
* `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10
*/
linkFarmFromDrvs = name: drvs:
let mkEntryFromDrv = drv: { name = drv.name; path = drv; };
in linkFarm name (map mkEntryFromDrv drvs);
/*
* Make a package that just contains a setup hook with the given contents.
@ -315,27 +400,6 @@ rec {
'';
/*
* Quickly create a set of symlinks to derivations.
* entries is a list of attribute sets like
* { name = "name" ; path = "/nix/store/..."; }
*
* Example:
*
* # Symlinks hello path in store to current $out/hello
* linkFarm "hello" [ { name = "hello"; path = pkgs.hello; } ];
*
*/
linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
''mkdir -p $out
cd $out
${lib.concatMapStrings (x: ''
mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name}
'') entries}
'';
/* Print an error message if the file with the specified name and
* hash doesn't exist in the Nix store. This function should only
* be used by non-redistributable software with an unfree license

View File

@ -15,7 +15,7 @@ rec {
name = last (builtins.split "/" nameOrPath);
in
pkgs.runCommand name (if (types.str.check content) then {
pkgs.runCommandLocal name (if (types.str.check content) then {
inherit content interpreter;
passAsFile = [ "content" ];
} else {
@ -192,7 +192,7 @@ rec {
{id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
'';
writeNginxConfig = name: text: pkgs.runCommand name {
writeNginxConfig = name: text: pkgs.runCommandLocal name {
inherit text;
passAsFile = [ "text" ];
} /* sh */ ''

View File

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
buildInputs = [ rustc ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
# fixes: error: the option `Z` is only accepted on the nightly compiler
RUSTC_BOOTSTRAP = 1;
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
'';
meta = with stdenv.lib; {
homepage = https://rust-lang.github.io/rust-clippy/;
homepage = "https://rust-lang.github.io/rust-clippy/";
description = "A bunch of lints to catch common mistakes and improve your Rust code";
maintainers = with maintainers; [ basvandijk ];
license = with licenses; [ mit asl20 ];

View File

@ -155,8 +155,10 @@ in stdenv.mkDerivation rec {
requiredSystemFeatures = [ "big-parallel" ];
passthru.llvm = llvmShared;
meta = with stdenv.lib; {
homepage = https://www.rust-lang.org/;
homepage = "https://www.rust-lang.org/";
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan globin havvy ];
license = [ licenses.mit licenses.asl20 ];

View File

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
# Hardcode paths used by Flatpak itself.
(substituteAll {
src = ./fix-paths.patch;
p11 = p11-kit;
p11kit = "${p11-kit.dev}/bin/p11-kit";
})
# Adapt paths exposed to sandbox for NixOS.

View File

@ -7,7 +7,7 @@ index 5dd7629e..ddc71a4c 100644
int i;
char *p11_argv[] = {
- "p11-kit", "server",
+ "@p11@/bin/p11-kit", "server",
+ "@p11kit@", "server",
/* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
* this flag. This is good, because those earlier versions did not properly daemonize and caused
* the spawn_sync to hang forever, waiting for the pipe to close.

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "freenect";
version = "0.5.7";
version = "0.6.0";
src = fetchFromGitHub {
owner = "OpenKinect";
repo = "libfreenect";
rev = "v${version}";
sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9";
};
buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ]

View File

@ -0,0 +1,43 @@
{ stdenv
, fetchpatch
, autoconf
, automake
, fetchFromGitHub
, pkgconfig
}:
stdenv.mkDerivation rec {
pname = "mypaint-brushes";
version = "1.3.0";
src = fetchFromGitHub {
owner = "mypaint";
repo = pname;
rev = "v${version}";
sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
};
patches = [
# build with automake 1.16
(fetchpatch {
url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
})
];
nativeBuildInputs = [
autoconf
automake
pkgconfig
];
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
homepage = "http://mypaint.org/";
description = "Brushes used by MyPaint and other software using libmypaint.";
license = licenses.cc0;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}

View File

@ -1,5 +1,4 @@
{ stdenv
, fetchpatch
, autoconf
, automake
, fetchFromGitHub
@ -8,23 +7,15 @@
stdenv.mkDerivation rec {
pname = "mypaint-brushes";
version = "1.3.0";
version = "2.0.2";
src = fetchFromGitHub {
owner = "mypaint";
repo = pname;
rev = "v${version}";
sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9";
};
patches = [
# build with automake 1.16
(fetchpatch {
url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
})
];
nativeBuildInputs = [
autoconf
automake

View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, cmake, doxygen }:
stdenv.mkDerivation rec {
pname = "ogdf";
version = "2020.02";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "catalpa-202002";
sha256 = "0drrs8zh1097i5c60z9g658vs9k1iinkav8crlwk722ihfm1vxqd";
};
nativeBuildInputs = [ cmake doxygen ];
cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-fPIC" ];
# Without disabling hardening for format, the build fails with
# the following error.
#> /build/source/src/coin/CoinUtils/CoinMessageHandler.cpp:766:35: error: format not a string literal and no format arguments [-Werror=format-security]
#> 766 | sprintf(messageOut_,format_+2);
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework";
homepage = "http://www.ogdf.net";
license = licenses.gpl2;
maintainers = [ maintainers.ianwookim ];
platforms = platforms.i686 ++ platforms.x86_64;
longDescription = ''
OGDF stands both for Open Graph Drawing Framework (the original name) and
Open Graph algorithms and Data structures Framework.
OGDF is a self-contained C++ library for graph algorithms, in particular
for (but not restricted to) automatic graph drawing. It offers sophisticated
algorithms and data structures to use within your own applications or
scientific projects.
OGDF is developed and supported by Osnabrück University, TU Dortmund,
University of Cologne, University of Konstanz, and TU Ilmenau.
'';
};
}

View File

@ -6,6 +6,7 @@
, python-daemon
, pyyaml
, six
, stdenv
, ansible
, pytest
, mock
@ -30,8 +31,12 @@ buildPythonPackage rec {
six
];
# test_process_isolation_settings is currently broken on Darwin Catalina
# https://github.com/ansible/ansible-runner/issues/413
checkPhase = ''
HOME=$(mktemp -d) pytest --ignore test/unit/test_runner.py -k "not test_prepare"
HOME=$TMPDIR pytest \
--ignore test/unit/test_runner.py \
-k "not prepare ${lib.optionalString stdenv.isDarwin "and not process_isolation_settings"}"
'';
meta = with lib; {

View File

@ -1,7 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, isPy27
, nose
}:
buildPythonPackage rec {
@ -13,15 +14,20 @@ buildPythonPackage rec {
sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c";
};
# Messy test suite. Even when running the tests like tox does, it fails
doCheck = false;
# python2 can't import a test fixture
doCheck = !isPy27;
checkInputs = [ nose ];
checkPhase = ''
for test in tests/*.py; do
${python.interpreter} $test
done
PYTHONPATH=$PWD/tests:$PYTHONPATH
nosetests \
--ignore-files="test_classdef" \
--ignore-files="test_objects" \
--ignore-files="test_selected" \
--exclude="test_the_rest" \
--exclude="test_importable"
'';
# Following error without setting checkPhase
# TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0}
# Tests seem to fail because of import pathing and referencing items/classes in modules.
# Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests.
meta = {
description = "Serialize all of python (almost)";

View File

@ -0,0 +1,50 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
, pkgs
, numpy
, scipy
# check inputs
, nose
}:
buildPythonPackage rec {
pname = "ecos";
version = "2.0.7.post1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "embotech";
repo = "ecos-python";
rev = version;
sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0";
fetchSubmodules = true;
};
prePatch = ''
echo '__version__ = "${version}"' >> ./src/ecos/version.py
'';
propagatedBuildInputs = [
numpy
scipy
];
checkInputs = [ nose ];
checkPhase = ''
# Run tests
cd ./src
nosetests test_interface.py test_interface_bb.py
'';
pythonImportsCheck = [ "ecos" ];
meta = with lib; {
description = "Python package for ECOS: Embedded Cone Solver";
downloadPage = "https://github.com/embotech/ecos-python/releases";
homepage = pkgs.ecos.meta.homepage;
license = licenses.asl20;
maintainers = with maintainers; [ drewrisinger ];
};
}

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "ftfy";
version = "5.6";
version = "5.7";
# ftfy v5 only supports python3. Since at the moment the only
# packages that use ftfy are spacy and textacy which both support
# python 2 and 3, they have pinned ftfy to the v4 branch.
@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1k4vr5rfa62yafwpmb4827n50pwb79if0vhg1y4yqbb0bv20jxbd";
sha256 = "1j143kfpnskksfzs0pnr37kwph6m7c71p8gdldv26x2b7arwiyb7";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchPypi
, cmake
, future
, numpy
# check inputs
, scipy
, pytestCheckHook
, mkl
}:
buildPythonPackage rec {
pname = "osqp";
version = "0.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7";
};
nativeBuildInputs = [ cmake ];
dontUseCmakeConfigure = true;
propagatedBuildInputs = [
numpy
future
];
checkInputs = [ scipy pytestCheckHook mkl ];
pythonImportsCheck = [ "osqp" ];
dontUseSetuptoolsCheck = true; # running setup.py fails if false
preCheck = ''
export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH;
'';
meta = with lib; {
description = "The Operator Splitting QP Solver";
longDescription = ''
Numerical optimization package for solving problems in the form
minimize 0.5 x' P x + q' x
subject to l <= A x <= u
where x in R^n is the optimization variable
'';
homepage = "https://osqp.org/";
downloadPage = "https://github.com/oxfordcontrol/osqp";
license = licenses.asl20;
maintainers = with lib.maintainers; [ drewrisinger ];
};
}

View File

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
}:
buildPythonPackage rec {
pname = "pylatexenc";
version = "2.1";
src = fetchFromGitHub {
owner = "phfaist";
repo = pname;
rev = "v${version}";
sha256 = "0wnl00y5dl56aw9j4y21kqapraaravbycwfxdmjsbgl11nk4llx9";
};
pythonImportsCheck = [ "pylatexenc" ];
checkInputs = [ pytest ];
checkPhase = ''
pytest
'';
meta = with lib; {
description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion";
homepage = "https://pylatexenc.readthedocs.io";
downloadPage = "https;//www.github.com/phfaist/pylatexenc";
license = licenses.mit;
maintainers = with maintainers; [ drewrisinger ];
};
}

View File

@ -1,18 +1,22 @@
{ stdenv
, fetchFromGitHub
, buildPythonPackage
, isPyPy
, pkgs
, python
, six
}:
buildPythonPackage rec {
pname = "pyparted";
version = "3.10.7";
version = "3.11.4";
disabled = isPyPy;
src = pkgs.fetchurl {
url = "https://github.com/rhinstaller/pyparted/archive/v${version}.tar.gz";
sha256 = "0c9ljrdggwawd8wdzqqqzrna9prrlpj6xs59b0vkxzip0jkf652r";
src = fetchFromGitHub {
repo = pname;
owner = "dcantrell";
rev = "v${version}";
sha256 = "0wd0xhv1y1zw7djzcnimj8irif3mg0shbhgz0jn5yi914is88h6n";
};
postPatch = ''
@ -26,11 +30,16 @@ buildPythonPackage rec {
tests/test__ped_ped.py
'';
patches = [
./fix-test-pythonpath.patch
];
preConfigure = ''
PATH="${pkgs.parted}/sbin:$PATH"
'';
nativeBuildInputs = [ pkgs.pkgconfig ];
checkInputs = [ six ];
propagatedBuildInputs = [ pkgs.parted ];
checkPhase = ''
@ -39,10 +48,10 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
homepage = "https://fedorahosted.org/pyparted/";
homepage = "https://github.com/dcantrell/pyparted/";
description = "Python interface for libparted";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ lsix ];
};
}

View File

@ -0,0 +1,26 @@
diff -ur a/Makefile b/Makefile
--- a/Makefile 1980-01-02 00:00:00.000000000 +0100
+++ b/Makefile 2020-02-18 20:04:14.068243263 +0100
@@ -39,19 +39,19 @@
@$(PYTHON) setup.py build
test: all
- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
$(PYTHON) -m unittest discover -v
coverage: all
@echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***"
- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
$(COVERAGE) run --branch -m unittest discover -v
$(COVERAGE) report --include="build/lib.*/parted/*" --show-missing
$(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log
check: clean
env PYTHON=python3 $(MAKE) ; \
- env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
+ env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
tests/pylint/runpylint.py
dist:

View File

@ -4,12 +4,13 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "brakeman";
version = "4.7.2";
source.sha256 = "1j1svldxvbl27kpyp9yngfwa0fdqal926sjk0cha7h520wvnz79k";
version = "4.8.0";
source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg";
meta = with lib; {
description = "Static analysis security scanner for Ruby on Rails";
homepage = "https://brakemanscanner.org/";
changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}";
license = [ licenses.unfreeRedistributable ];
platforms = ruby.meta.platforms;
maintainers = [ maintainers.marsam ];

View File

@ -26,6 +26,12 @@ rustPlatform.buildRustPackage rec {
# we might be able to run these with something like
# `cargo insta review` in the `preCheck` phase.
checkPhase = ''
cd cargo-geiger/tests/snapshots
for file in *
do
mv $file r#$file
done
cd -
cargo test -- \
--skip test_package::case_2 \
--skip test_package::case_3 \

View File

@ -347,12 +347,12 @@ let
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
version = "2020-02-04";
version = "2020-02-16";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
rev = "e75395a9064dd88b2434c8824e6de1f173944595";
sha256 = "1ga01205rdq1zgdpbn3xk4rnd0p4bbfn7wn4jn04wxfyb5rkdnkq";
rev = "f67abbe05f535086167b3cb4cde6c2c309905959";
sha256 = "0fl3hgapcwr5sjgmm02lx6vg18qlw5g03ysv926rjb0r0nl3rhh5";
};
};
@ -898,12 +898,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2020-02-05";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "21645215f941034f0bfaa081f9146914afd5d563";
sha256 = "01ywp49ambc3nk0cyv9f7m6gfnf5hkp1dxfiihjxf96whg8p3kwj";
rev = "eeb067ca291b7f677b6faab590344a4ca84c0e70";
sha256 = "0irz8g9qpm7d36gig86j3dqk4mdbzl5rnzg07cgizh88jqhzxvin";
};
};
@ -2060,12 +2060,12 @@ let
neoterm = buildVimPluginFrom2Nix {
pname = "neoterm";
version = "2020-02-14";
version = "2020-02-15";
src = fetchFromGitHub {
owner = "kassio";
repo = "neoterm";
rev = "41b309e5528ce07c9471ea4f2fae41e2a539ae49";
sha256 = "1knqa3gd9jbj865p8zhy2yks8wfszp7fdnnd29088i82d0sl8g10";
rev = "dacbae9d844e678c785db7c9d7988df7a405e572";
sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv";
};
};
@ -2157,6 +2157,17 @@ let
};
};
notational-fzf-vim = buildVimPluginFrom2Nix {
pname = "notational-fzf-vim";
version = "2019-12-03";
src = fetchFromGitHub {
owner = "alok";
repo = "notational-fzf-vim";
rev = "16ea3477c8dbf3167f15246a29bd1d1fcc18c914";
sha256 = "1j1nfb297rqmg2h96hx4bmgxq55z179fh4f1ak79d6v815mr72bi";
};
};
nvim-cm-racer = buildVimPluginFrom2Nix {
pname = "nvim-cm-racer";
version = "2017-07-27";
@ -2203,12 +2214,12 @@ let
nvim-lsp = buildVimPluginFrom2Nix {
pname = "nvim-lsp";
version = "2020-02-13";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lsp";
rev = "63d8e18a1003ad986ce0c95199839adb10283dbd";
sha256 = "1q1myv0hqlscsnmmxqbl5bxvqkgl896p1b1l93826wbfsnpr6wn6";
rev = "8c78ca42072d14ca678cd1e138f665a5d42df558";
sha256 = "10w7rzpfl70bg6w665pfq6mgdz9gsw5i341sd4f0ncr2asrd7l76";
};
};
@ -2533,12 +2544,12 @@ let
riv-vim = buildVimPluginFrom2Nix {
pname = "riv-vim";
version = "2019-09-14";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "Rykka";
repo = "riv.vim";
rev = "87a1f2c1e487ee0021855fd0c65c3f3244f4fc61";
sha256 = "13430czv87r16wcyb2f8izfihkhm2q6k1ki5bhzpbakzk7vwxwms";
rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3";
sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5";
};
};
@ -3315,23 +3326,23 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2020-02-07";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "099dd92eebe09ab27a483e381f2a708945e34330";
sha256 = "04rmghvl29hlmlhh4j90m466m0a4sfflk0qrvx87q8ab1salq6iz";
rev = "7e00ee1107d0ed24ac09af51e576ea7d85e114a3";
sha256 = "02ax3y8kh503dh7gsi0nwsvlas02vd4issawriydy1wl8ngfgdbh";
};
};
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2020-02-07";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "6270e7d58828999da7239785ad4269899fab99b5";
sha256 = "1pjgsp4ki1ii5rw75wvzcj3ssz51w5369j8kqaf6awqimyl1ygsd";
rev = "9772475fcc24bee50c884aba20161465211520c8";
sha256 = "1nbwwaky9j4w9qjsbgg2a9zl3f2i9zjqqbh1lmz4z9m1mixj6djp";
};
};
@ -3964,12 +3975,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2020-02-06";
version = "2020-02-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "460664018a8eaecd89fb2b095fad59c0e16f5f06";
sha256 = "1xznsxk63gjzhxldzngc0kx10ygkl8ank0xm75qqs92zciwg1xqx";
rev = "98f67310aa3ae324d725a3b6b68a63e5a48372f4";
sha256 = "177dk2b2mb13d6hf6hp97p91qsbafd29z8n3zdfwxjgxf9fjgl4c";
};
};
@ -4515,12 +4526,12 @@ let
vim-localvimrc = buildVimPluginFrom2Nix {
pname = "vim-localvimrc";
version = "2019-05-10";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "embear";
repo = "vim-localvimrc";
rev = "0b36a367f4d46b7f060836fcbfec029cce870ea9";
sha256 = "119ah0mx7ais335spdy5apk40wbfvhr1mnvjfs429fvym3xdqfk3";
rev = "1e3238470d833c8622453245694ba107eca46133";
sha256 = "1agiyycrjkh1ajfpfj4vzl9sd3xpxv68c7jrqkxqq0rfg74rksbc";
};
};
@ -4966,12 +4977,12 @@ let
vim-ps1 = buildVimPluginFrom2Nix {
pname = "vim-ps1";
version = "2019-12-06";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "PProvost";
repo = "vim-ps1";
rev = "d11593b4a65551cc3391d36b088cc87a59c62da6";
sha256 = "08d9mp6ig3vkvmynm6qfvb18hc128wwssffkwdd9xnqkr7c3dmlv";
rev = "72de10080dcb7a906a51ed4eba67611c400df142";
sha256 = "1ml521kkgiazjizpmn25p4kbmwdl46sc5mq6yzp9cskssbj2c416";
};
};
@ -5043,12 +5054,12 @@ let
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
version = "2019-05-18";
version = "2020-02-17";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
rev = "eef98131fef264d0f4e4f95c42e0de476c78009c";
sha256 = "144wwvi295q387w6cy9mv2inzla8ngd735gmf65lf33llp8hga59";
rev = "8a0a201a17fae3f7656b99f74d67741986faba37";
sha256 = "1r8kzzljs39ycc6jjh5anpl2gw73c2wb1bs8hjv6xnw1scln6gwq";
};
};
@ -5219,12 +5230,12 @@ let
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
version = "2019-12-20";
version = "2020-02-16";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
rev = "cf896c1f4f37a9feb15d657dfd120aeeb6215ad8";
sha256 = "19caali0yy1cy4hk9y9z21nzp0kj916551h0p0x7nmzxiiakp9nn";
rev = "80c04d49b8d3c2a182e5cd745c52153de6ae272c";
sha256 = "12k1xq8xmwb7v7i8yx55mpg7fzin0ag2rvxvz77kdiwwni4vdrii";
};
};
@ -5450,12 +5461,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2020-02-02";
version = "2020-02-16";
src = fetchFromGitHub {
owner = "janko-m";
repo = "vim-test";
rev = "d0b1e060a7d6dce541f5535f9cc5a24bab1f45aa";
sha256 = "0z0002nij5n5y9vkx7c1fhngpz60py2xp2lkyy0xd7b1wynh3pgw";
rev = "330b0911f13bcb48a3e28dedcf71e19de5bd4864";
sha256 = "0iibm4nzxf7fhn5ka3pmnw324xnnxcf1lkia20w0wbx39axn4br3";
};
};
@ -5527,12 +5538,12 @@ let
vim-themis = buildVimPluginFrom2Nix {
pname = "vim-themis";
version = "2020-02-13";
version = "2020-02-16";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-themis";
rev = "002eb3566e2cd6426e1d32713d585389da40abeb";
sha256 = "066r6132dr37xgl3gz661iyhcx4qb8k548b88smrpar8k8vsgj9n";
rev = "734262315544ec4c78acdabd1ac9aae18644fcad";
sha256 = "0sh9kqnkbbbiqsl8qwqslygl72h3wi83iw9iy2aj4zmw7k2g3i8w";
};
};
@ -5659,12 +5670,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
version = "2020-02-10";
version = "2020-02-16";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
rev = "9d03a5d366b4198b7b505dfda538e87f76c9ce60";
sha256 = "0yqqd25l7zzfn31216qpnccb3a3lvv75j6020q02s0wgapiw15y9";
rev = "0f85922ec3cc0c497ac91ce02e5252643bcf7947";
sha256 = "1kgqns7a8px13hh0kfdn12zg3f6zv0s3sphxl899mywnp4nx3489";
};
};
@ -5824,12 +5835,12 @@ let
vimoutliner = buildVimPluginFrom2Nix {
pname = "vimoutliner";
version = "2018-07-04";
version = "2020-02-09";
src = fetchFromGitHub {
owner = "vimoutliner";
repo = "vimoutliner";
rev = "aad0a213069b8a1b5de91cca07d153fc8352c957";
sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2";
rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9";
sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0";
};
};

View File

@ -4,6 +4,7 @@ airblade/vim-rooter
ajh17/Spacegray.vim
aklt/plantuml-syntax
albfan/nerdtree-git-plugin
alok/notational-fzf-vim
altercation/vim-colors-solarized
alvan/vim-closetag
alx741/vim-hindent

View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.6-rc1";
version = "5.6-rc2";
extraMeta.branch = "5.6";
# modDirVersion needs to be x.y.z, will always add .0
@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1ir7mdzxrin7k6a7ldfmpl9bbapkr99l3pd07dv8589vcrd43zlh";
sha256 = "1b3ds8dv5rc9f4c3czj689dxbl8lyrmnfk6ywa51h9vx3lsd5jrp";
};
# Should the testing kernels ever be built on Hydra?

View File

@ -0,0 +1,34 @@
{ stdenv, fetchFromGitLab, writeText }:
let
localConfig = writeText "config.local.php" ''
<?php
return require(getenv('JIRAFEAU_CONFIG'));
?>
'';
in
stdenv.mkDerivation rec {
pname = "jirafeau";
version = "4.1.1";
src = fetchFromGitLab {
owner = "mojo42";
repo = "Jirafeau";
rev = "${version}";
sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c";
};
installPhase = ''
mkdir $out
cp -r * $out/
cp ${localConfig} $out/lib/config.local.php
'';
meta = with stdenv.lib; {
description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it.";
license = licenses.agpl3;
homepage = "https://gitlab.com/mojo42/Jirafeau";
platforms = platforms.all;
maintainers = with maintainers; [ davidtwco ];
};
}

View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc";
sha256 = "08zqvk8qkilynfivx1jnr2yqrav64p9cy9i30jjgcqrh2gsrb9dd";
};
cargoSha256 = "14v25smx23d5d386dyw0gspddj6g9am1qpg4ykc1a8lmr0h4ccrk";
cargoSha256 = "1gpg0jpd5pmmny9gzzbkph1h2kqmjlapdsw04jzx852yg89lls5v";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

View File

@ -1,4 +1,11 @@
{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }:
{ stdenv
, fetchFromGitHub
, fetchpatch
, python3Packages
, glibcLocales
, coreutils
, git
}:
python3Packages.buildPythonApplication rec {
pname = "xonsh";
@ -12,6 +19,14 @@ python3Packages.buildPythonApplication rec {
sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv";
};
patches = [
(fetchpatch {
name = "fix-ptk-tests.patch";
url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch";
sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw";
})
];
LC_ALL = "en_US.UTF-8";
postPatch = ''
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py

View File

@ -0,0 +1,23 @@
{ stdenv, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "s3bro";
version = "2.8";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0k25g3vch0q772f29jlghda5mjvps55h5lgwhwwbd5g2nlnrrspq";
};
propagatedBuildInputs = with python3Packages; [ boto3 botocore click termcolor ];
# No tests
doCheck = false;
meta = with stdenv.lib; {
description = "A handy s3 cli tool";
homepage = https://github.com/rsavordelli/s3bro;
license = licenses.mit;
maintainers = with maintainers; [ psyanticy ];
};
}

View File

@ -70,6 +70,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
homepage = https://www.hdfgroup.org/HDF5/;
platforms = stdenv.lib.platforms.unix;
broken = (gfortran != null) && stdenv.isDarwin;
};
}

View File

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.pmacct.net/";
license = licenses.gpl2;
maintainers = with maintainers; [ "0x4A6F" ];
maintainers = [ maintainers."0x4A6F" ];
platforms = platforms.unix;
};
}

View File

@ -173,10 +173,10 @@ in rec {
};
nixStable = callPackage common (rec {
name = "nix-2.3.2";
name = "nix-2.3.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8";
sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224";
};
inherit storeDir stateDir confDir boehmgc;

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.45"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.74"

View File

@ -1,16 +1,15 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 2b9e74c7a8a4423ea195e75abca1f56c354e5541
ref: refs/tags/5.0.45
revision: 22104a154544b3ee57d3ce98a490c4b42a4a8776
ref: refs/tags/5.0.74
specs:
metasploit-framework (5.0.45)
metasploit-framework (5.0.74)
actionpack (~> 4.2.6)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
aws-sdk-ec2
aws-sdk-iam
aws-sdk-s3
backports
bcrypt (= 3.1.12)
bcrypt_pbkdf
bit-struct
@ -18,16 +17,19 @@ GIT
dnsruby
ed25519
em-http-request
eventmachine
faker
faraday (<= 0.17.0)
faye-websocket
filesize
jsobfu
json
metasm
metasploit-concern
metasploit-credential
metasploit-model
metasploit-payloads (= 1.3.70)
metasploit_data_models (= 3.0.10)
metasploit-concern (~> 2.0.0)
metasploit-credential (~> 3.0.0)
metasploit-model (~> 2.0.4)
metasploit-payloads (= 1.3.84)
metasploit_data_models (~> 3.0.10)
metasploit_payloads-mettle (= 0.5.16)
mqtt
msgpack
@ -61,7 +63,7 @@ GIT
rex-random_identifier
rex-registry
rex-rop_builder
rex-socket (= 0.1.17)
rex-socket
rex-sslscan
rex-struct2
rex-text
@ -114,39 +116,38 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
arel (6.0.4)
arel-helpers (2.10.0)
arel-helpers (2.11.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.0.3)
aws-partitions (1.208.0)
aws-sdk-core (3.66.0)
aws-partitions (1.274.0)
aws-sdk-core (3.90.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.106.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-ec2 (1.144.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.29.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-iam (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (1.29.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.48.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-s3 (1.60.2)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
backports (3.15.0)
bcrypt (3.1.12)
bcrypt_pbkdf (1.0.1)
bindata (2.4.4)
bit-struct (0.16)
builder (3.2.3)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
crass (1.0.4)
crass (1.0.6)
daemons (1.3.1)
dnsruby (1.61.3)
addressable (~> 2.5)
@ -163,8 +164,11 @@ GEM
eventmachine (1.2.7)
faker (2.2.1)
i18n (>= 0.8)
faraday (0.15.4)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.9)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
filesize (0.2.0)
hashery (2.1.2)
http_parser.rb (0.6.0)
@ -173,8 +177,8 @@ GEM
jmespath (1.4.0)
jsobfu (0.4.2)
rkelly-remix
json (2.2.0)
loofah (2.2.3)
json (2.3.0)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
@ -182,7 +186,7 @@ GEM
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
metasploit-credential (3.0.3)
metasploit-credential (3.0.4)
metasploit-concern
metasploit-model
metasploit_data_models (>= 3.0.0)
@ -196,7 +200,7 @@ GEM
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
railties (~> 4.2.6)
metasploit-payloads (1.3.70)
metasploit-payloads (1.3.84)
metasploit_data_models (3.0.10)
activerecord (~> 4.2.6)
activesupport (~> 4.2.6)
@ -209,17 +213,18 @@ GEM
recog (~> 2.0)
metasploit_payloads-mettle (0.5.16)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.14.0)
mqtt (0.5.0)
msgpack (1.3.1)
msgpack (1.3.3)
multipart-post (2.1.1)
nessus_rest (0.1.6)
net-ssh (5.2.0)
network_interface (0.0.2)
nexpose (7.2.1)
nokogiri (1.10.4)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
octokit (4.16.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.2)
openvas-omp (0.0.4)
@ -227,7 +232,7 @@ GEM
pcaprub
patch_finder (1.0.2)
pcaprub (0.13.0)
pdf-reader (2.2.1)
pdf-reader (2.4.0)
Ascii85 (~> 1.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
@ -239,8 +244,8 @@ GEM
activerecord (~> 4.0)
arel (>= 4.0.1)
pg_array_parser (~> 0.0.9)
public_suffix (4.0.1)
rack (1.6.11)
public_suffix (4.0.3)
rack (1.6.13)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
@ -251,16 +256,16 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.3)
rake (13.0.1)
rb-readline (0.5.5)
recog (2.3.2)
recog (2.3.6)
nokogiri
redcarpet (3.5.0)
rex-arch (0.1.13)
@ -276,7 +281,7 @@ GEM
metasm
rex-arch
rex-text
rex-exploitation (0.1.21)
rex-exploitation (0.1.22)
jsobfu
metasm
rex-arch
@ -289,7 +294,7 @@ GEM
rex-arch
rex-ole (0.1.6)
rex-text
rex-powershell (0.1.82)
rex-powershell (0.1.86)
rex-random_identifier
rex-text
rex-random_identifier (0.1.4)
@ -299,14 +304,14 @@ GEM
metasm
rex-core
rex-text
rex-socket (0.1.17)
rex-socket (0.1.21)
rex-core
rex-sslscan (0.1.5)
rex-core
rex-socket
rex-text
rex-struct2 (0.1.2)
rex-text (0.2.23)
rex-text (0.2.24)
rex-zip (0.1.3)
rex-text
rkelly-remix (0.0.7)
@ -317,7 +322,7 @@ GEM
rubyntlm
windows_error
rubyntlm (0.6.2)
rubyzip (1.2.3)
rubyzip (2.2.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@ -325,22 +330,25 @@ GEM
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sqlite3 (1.4.1)
sqlite3 (1.4.2)
sshkey (2.0.0)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.3)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.9)
ttfunk (1.5.1)
tzinfo (1.2.5)
tilt (2.0.10)
ttfunk (1.6.2.1)
tzinfo (1.2.6)
thread_safe (~> 0.1)
tzinfo-data (1.2019.2)
tzinfo-data (1.2019.3)
tzinfo (>= 1.0.0)
warden (1.2.7)
rack (>= 1.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
windows_error (0.1.2)
xdr (2.0.0)
activemodel (>= 4.2.7)
@ -354,4 +362,4 @@ DEPENDENCIES
metasploit-framework!
BUNDLED WITH
1.17.2
1.17.3

View File

@ -17,13 +17,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "5.0.45";
version = "5.0.74";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5";
sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp";
};
buildInputs = [ makeWrapper ];

View File

@ -1,6 +1,5 @@
{
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
@ -11,7 +10,6 @@
version = "4.2.11.1";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
@ -22,7 +20,6 @@
version = "4.2.11.1";
};
activemodel = {
dependencies = ["activesupport" "builder"];
groups = ["default"];
platforms = [];
source = {
@ -33,7 +30,6 @@
version = "4.2.11.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
groups = ["default"];
platforms = [];
source = {
@ -44,7 +40,6 @@
version = "4.2.11.1";
};
activesupport = {
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
@ -55,7 +50,6 @@
version = "4.2.11.1";
};
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
@ -86,15 +80,14 @@
version = "6.0.4";
};
arel-helpers = {
dependencies = ["activerecord"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lb52rd20ix7khh70vrwd85qivir9sis62s055k3zr5h9iy3lyqi";
sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp";
type = "gem";
};
version = "2.10.0";
version = "2.11.0";
};
Ascii85 = {
groups = ["default"];
@ -121,68 +114,62 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vkjw8cxssfwplrcl593gp4jxxiajihb8gqmpgzyac8i3xigpacb";
sha256 = "1k2dpn0xznksh5y9bq9gbvbych06pzyswsdak7bz8nlkbsgf38x3";
type = "gem";
};
version = "1.208.0";
version = "1.274.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18h35j7wp7n6zc5r6dpixjcyjshqmpkhwph9qgpv2g0db37zlxyk";
sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i";
type = "gem";
};
version = "3.66.0";
version = "3.90.1";
};
aws-sdk-ec2 = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sb04blmc0lgdgq909cj8cm63zl2idgc5mcysj6cg4rvm8699ahp";
sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5";
type = "gem";
};
version = "1.106.0";
version = "1.144.0";
};
aws-sdk-iam = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypv1cmmrc496myllqd8dqz422qm1i0bhskkvqb9b2lbagmzr3l9";
sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz";
type = "gem";
};
version = "1.33.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw";
type = "gem";
};
version = "1.29.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14blvvfz67rhffi4ahby50jiip5f0hm85mcxlx6y93g0cfrnxh3m";
type = "gem";
};
version = "1.24.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14iv2wqvvbiz0gdms21i9n6rh8390r1yg4zcf8pzzfplbqfwqw4w";
sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz";
type = "gem";
};
version = "1.48.0";
version = "1.60.2";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
@ -192,16 +179,6 @@
};
version = "1.1.0";
};
backports = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2";
type = "gem";
};
version = "3.15.0";
};
bcrypt = {
groups = ["default"];
platforms = [];
@ -247,10 +224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
version = "3.2.3";
version = "3.2.4";
};
concurrent-ruby = {
groups = ["default"];
@ -277,10 +254,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
type = "gem";
};
version = "1.0.4";
version = "1.0.6";
};
daemons = {
groups = ["default"];
@ -293,7 +270,6 @@
version = "1.3.1";
};
dnsruby = {
dependencies = ["addressable"];
groups = ["default"];
platforms = [];
source = {
@ -314,7 +290,6 @@
version = "1.2.4";
};
em-http-request = {
dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
groups = ["default"];
platforms = [];
source = {
@ -325,7 +300,6 @@
version = "1.1.5";
};
em-socksify = {
dependencies = ["eventmachine"];
groups = ["default"];
platforms = [];
source = {
@ -356,7 +330,6 @@
version = "1.2.7";
};
faker = {
dependencies = ["i18n"];
groups = ["default"];
platforms = [];
source = {
@ -367,15 +340,24 @@
version = "2.2.1";
};
faraday = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az";
type = "gem";
};
version = "0.15.4";
version = "0.17.0";
};
faye-websocket = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kbp3rjwm74zdj0wy2n1cyyvd7ak4k8i8zva6ib4vqfcv8d2j11a";
type = "gem";
};
version = "0.10.9";
};
filesize = {
groups = ["default"];
@ -408,7 +390,6 @@
version = "0.6.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
@ -429,7 +410,6 @@
version = "1.4.0";
};
jsobfu = {
dependencies = ["rkelly-remix"];
groups = ["default"];
platforms = [];
source = {
@ -444,21 +424,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
type = "gem";
};
version = "2.2.0";
version = "2.3.0";
};
loofah = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn";
type = "gem";
};
version = "2.2.3";
version = "2.4.0";
};
metasm = {
groups = ["default"];
@ -471,7 +450,6 @@
version = "1.0.4";
};
metasploit-concern = {
dependencies = ["activemodel" "activesupport" "railties"];
groups = ["default"];
platforms = [];
source = {
@ -482,31 +460,28 @@
version = "2.0.5";
};
metasploit-credential = {
dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m6j149x502p00y2jzra65281dhhw3m8a41pwfn1sk9wv7aiclvl";
sha256 = "1jh1mzvjpsmqamhwjqs6x2bx550mxkqjvl0f1gl1g87w5qvg3w69";
type = "gem";
};
version = "3.0.3";
version = "3.0.4";
};
metasploit-framework = {
dependencies = ["actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-iam" "aws-sdk-s3" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "concurrent-ruby" "dnsruby" "ed25519" "em-http-request" "faker" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "thin" "tzinfo" "tzinfo-data" "warden" "windows_error" "xdr" "xmlrpc"];
groups = ["default"];
platforms = [];
source = {
fetchSubmodules = false;
rev = "2b9e74c7a8a4423ea195e75abca1f56c354e5541";
sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5";
rev = "22104a154544b3ee57d3ce98a490c4b42a4a8776";
sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "5.0.45";
version = "5.0.74";
};
metasploit-model = {
dependencies = ["activemodel" "activesupport" "railties"];
groups = ["default"];
platforms = [];
source = {
@ -521,13 +496,12 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01s3xmgw4fp2ic0wql8lswa86q3lgr3z687idx3xkfii3dskjpp3";
sha256 = "1wz72w5a34r6jcgbl97ha3zhl8d28r974clcp99qj5sg71k280c0";
type = "gem";
};
version = "1.3.70";
version = "1.3.84";
};
metasploit_data_models = {
dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"];
groups = ["default"];
platforms = [];
source = {
@ -562,10 +536,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
type = "gem";
};
version = "5.11.3";
version = "5.14.0";
};
mqtt = {
groups = ["default"];
@ -582,10 +556,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih";
type = "gem";
};
version = "1.3.1";
version = "1.3.3";
};
multipart-post = {
groups = ["default"];
@ -638,26 +612,24 @@
version = "7.2.1";
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
type = "gem";
};
version = "1.10.4";
version = "1.10.8";
};
octokit = {
dependencies = ["sawyer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha";
sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn";
type = "gem";
};
version = "4.14.0";
version = "4.16.0";
};
openssl-ccm = {
groups = ["default"];
@ -680,7 +652,6 @@
version = "0.0.4";
};
packetfu = {
dependencies = ["pcaprub"];
groups = ["default"];
platforms = [];
source = {
@ -711,15 +682,14 @@
version = "0.13.0";
};
pdf-reader = {
dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14lqdbiwn2qwgbvnnzxg7haqiy026d8x37hp45c3m9jb9rym92ps";
sha256 = "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy";
type = "gem";
};
version = "2.2.1";
version = "2.4.0";
};
pg = {
groups = ["default"];
@ -742,7 +712,6 @@
version = "0.0.9";
};
postgres_ext = {
dependencies = ["activerecord" "arel" "pg_array_parser"];
groups = ["default"];
platforms = [];
source = {
@ -757,23 +726,22 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
type = "gem";
};
version = "4.0.1";
version = "4.0.3";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
type = "gem";
};
version = "1.6.11";
version = "1.6.13";
};
rack-protection = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
@ -784,7 +752,6 @@
version = "1.5.5";
};
rack-test = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
@ -795,7 +762,6 @@
version = "0.6.3";
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
groups = ["default"];
platforms = [];
source = {
@ -806,7 +772,6 @@
version = "1.0.3";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
groups = ["default"];
platforms = [];
source = {
@ -817,18 +782,16 @@
version = "1.0.9";
};
rails-html-sanitizer = {
dependencies = ["loofah"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
type = "gem";
};
version = "1.2.0";
version = "1.3.0";
};
railties = {
dependencies = ["actionpack" "activesupport" "rake" "thor"];
groups = ["default"];
platforms = [];
source = {
@ -843,10 +806,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
type = "gem";
};
version = "12.3.3";
version = "13.0.1";
};
rb-readline = {
groups = ["default"];
@ -859,15 +822,14 @@
version = "0.5.5";
};
recog = {
dependencies = ["nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kbv0j82zf90sc9hhwna2bkb5zv0nxagk22gxyfy82kjmcz71c6k";
sha256 = "0kw753vq5m5m8pzn1avafzz757gdzzsv7ck94y6d8n4jzqa50isv";
type = "gem";
};
version = "2.3.2";
version = "2.3.6";
};
redcarpet = {
groups = ["default"];
@ -880,7 +842,6 @@
version = "3.5.0";
};
rex-arch = {
dependencies = ["rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -891,7 +852,6 @@
version = "0.1.13";
};
rex-bin_tools = {
dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -912,7 +872,6 @@
version = "0.1.13";
};
rex-encoder = {
dependencies = ["metasm" "rex-arch" "rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -923,15 +882,14 @@
version = "0.1.4";
};
rex-exploitation = {
dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b2jg7mccwc34j9mfpndh7b387723qas38qsd906bs4s8b6hf05c";
sha256 = "16anprj4pc4pi2yb1y6b7c8nrqgpk49g40wy1384snmii24jiwyx";
type = "gem";
};
version = "0.1.21";
version = "0.1.22";
};
rex-java = {
groups = ["default"];
@ -944,7 +902,6 @@
version = "0.1.5";
};
rex-mime = {
dependencies = ["rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -955,7 +912,6 @@
version = "0.1.5";
};
rex-nop = {
dependencies = ["rex-arch"];
groups = ["default"];
platforms = [];
source = {
@ -966,7 +922,6 @@
version = "0.1.1";
};
rex-ole = {
dependencies = ["rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -977,18 +932,16 @@
version = "0.1.6";
};
rex-powershell = {
dependencies = ["rex-random_identifier" "rex-text"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fcyiz8cgcv6pcn5w969ac4wwhr1cz6jk6kf6p8gyw5rjrlwfz0j";
sha256 = "150nmpgrvpd6hyx9cghah8dxpcfb1h7inpcwmz7ijpir60zxxfdj";
type = "gem";
};
version = "0.1.82";
version = "0.1.86";
};
rex-random_identifier = {
dependencies = ["rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -1009,7 +962,6 @@
version = "0.1.3";
};
rex-rop_builder = {
dependencies = ["metasm" "rex-core" "rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -1020,18 +972,16 @@
version = "0.1.3";
};
rex-socket = {
dependencies = ["rex-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "136szyv31fcdzmcgs44vg009k3ssyawkqppkhm3xyv2ivpp1mlgv";
sha256 = "0jkmff92ga9qd9gg13cd6s99qcdmr5n354l9br70j784mpyl9apb";
type = "gem";
};
version = "0.1.17";
version = "0.1.21";
};
rex-sslscan = {
dependencies = ["rex-core" "rex-socket" "rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -1056,13 +1006,12 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cmfwzd3r6xzhaw5l2grgiivql1yynh620drg8h39q8hiixya6xz";
sha256 = "0wjrp4n7j2ifdgqc6z8z4jbz9gr7g5m5h35b7vx4k9cbaq9b5zxw";
type = "gem";
};
version = "0.2.23";
version = "0.2.24";
};
rex-zip = {
dependencies = ["rex-text"];
groups = ["default"];
platforms = [];
source = {
@ -1103,7 +1052,6 @@
version = "0.1.5";
};
ruby_smb = {
dependencies = ["bindata" "rubyntlm" "windows_error"];
groups = ["default"];
platforms = [];
source = {
@ -1128,13 +1076,12 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
sha256 = "13b15icwx0c8zzjfzf7bmqq9ynilw0dy8ydgjb199nqzp93p6wqv";
type = "gem";
};
version = "1.2.3";
version = "2.2.0";
};
sawyer = {
dependencies = ["addressable" "faraday"];
groups = ["default"];
platforms = [];
source = {
@ -1145,7 +1092,6 @@
version = "0.8.2";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
groups = ["default"];
platforms = [];
source = {
@ -1160,10 +1106,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494";
sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
type = "gem";
};
version = "1.4.1";
version = "1.4.2";
};
sshkey = {
groups = ["default"];
@ -1176,7 +1122,6 @@
version = "2.0.0";
};
thin = {
dependencies = ["daemons" "eventmachine" "rack"];
groups = ["default"];
platforms = [];
source = {
@ -1191,10 +1136,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
type = "gem";
};
version = "0.20.3";
version = "1.0.1";
};
thread_safe = {
groups = ["default"];
@ -1211,45 +1156,42 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
version = "2.0.9";
version = "2.0.10";
};
ttfunk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd";
sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn";
type = "gem";
};
version = "1.5.1";
version = "1.6.2.1";
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
type = "gem";
};
version = "1.2.5";
version = "1.2.6";
};
tzinfo-data = {
dependencies = ["tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m507in0d7vlfgasxpkz3y1a44zp532k9qlqcaz90ay939sz9h5q";
sha256 = "17fbf05qhcxp8anmp7k5wnafw3ypy607h5ybnqg92dqgh4b1c3yi";
type = "gem";
};
version = "1.2019.2";
version = "1.2019.3";
};
warden = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
@ -1259,6 +1201,26 @@
};
version = "1.2.7";
};
websocket-driver = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
type = "gem";
};
version = "0.7.1";
};
websocket-extensions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
type = "gem";
};
version = "0.1.4";
};
windows_error = {
groups = ["default"];
platforms = [];
@ -1270,7 +1232,6 @@
version = "0.1.2";
};
xdr = {
dependencies = ["activemodel" "activesupport"];
groups = ["default"];
platforms = [];
source = {

View File

@ -4312,6 +4312,8 @@ in
jira-cli = callPackage ../development/tools/jira_cli { };
jirafeau = callPackage ../servers/web-apps/jirafeau { };
jitterentropy = callPackage ../development/libraries/jitterentropy { };
jl = haskellPackages.callPackage ../development/tools/jl { };
@ -5467,6 +5469,8 @@ in
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { };
ogdf = callPackage ../development/libraries/ogdf { };
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
ola = callPackage ../applications/misc/ola { };
@ -6268,6 +6272,8 @@ in
s3backer = callPackage ../tools/filesystems/s3backer { };
s3bro = callPackage ../tools/admin/s3bro { };
s3fs = callPackage ../tools/filesystems/s3fs { };
s3cmd = callPackage ../tools/networking/s3cmd { };
@ -20674,6 +20680,8 @@ in
mypaint = callPackage ../applications/graphics/mypaint { };
mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
mythtv = libsForQt5.callPackage ../applications/video/mythtv {

View File

@ -3279,6 +3279,13 @@ let
url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz;
sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f";
};
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/andk/cpanpm/pull/133.diff";
name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false";
sha256 = "0i8648cwshzzd0b34gyfn68s1vs85d8336ggk2kl99awah1ydsfr";
})
];
propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
meta = {
description = "Query, download and build perl modules from CPAN sites";
@ -3437,6 +3444,12 @@ let
url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz;
sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z";
};
patches = [
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382";
sha256 = "0l005jzxp6q6vyl3p43ji47if0v9inscnjl0vxaqzf6c17akgbhf";
})
];
meta = {
description = "Generate shared secret using elliptic-curve Diffie-Hellman function";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@ -11113,10 +11126,10 @@ let
MathGMP = buildPerlPackage {
pname = "Math-GMP";
version = "2.19";
version = "2.20";
src = fetchurl {
url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz;
sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i";
url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz;
sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn";
};
buildInputs = [ pkgs.gmp AlienGMP ];
NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include";

View File

@ -2985,6 +2985,8 @@ in {
oscrypto = callPackage ../development/python-modules/oscrypto { };
osqp = callPackage ../development/python-modules/osqp { };
oyaml = callPackage ../development/python-modules/oyaml { };
pamela = callPackage ../development/python-modules/pamela { };
@ -3082,6 +3084,8 @@ in {
pylama = callPackage ../development/python-modules/pylama { };
pylatexenc = callPackage ../development/python-modules/pylatexenc { };
pymbolic = callPackage ../development/python-modules/pymbolic { };
pymediainfo = callPackage ../development/python-modules/pymediainfo { };
@ -3431,6 +3435,8 @@ in {
ecdsa = callPackage ../development/python-modules/ecdsa { };
ecos = callPackage ../development/python-modules/ecos { };
effect = callPackage ../development/python-modules/effect {};
enum = callPackage ../development/python-modules/enum { };