Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
77750c1f20
45 changed files with 612 additions and 468 deletions
|
|
@ -7197,6 +7197,12 @@
|
|||
githubId = 13000278;
|
||||
name = "Maksim Bronsky";
|
||||
};
|
||||
PlushBeaver = {
|
||||
name = "Dmitry Kozlyuk";
|
||||
email = "dmitry.kozliuk+nixpkgs@gmail.com";
|
||||
github = "PlushBeaver";
|
||||
githubId = 8988269;
|
||||
};
|
||||
pmahoney = {
|
||||
email = "pat@polycrystal.org";
|
||||
github = "pmahoney";
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ with lib;
|
|||
services.dbus.packages = packages;
|
||||
systemd.packages = packages;
|
||||
|
||||
environment.variables = {
|
||||
environment.sessionVariables = {
|
||||
GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1";
|
||||
XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals";
|
||||
};
|
||||
|
|
|
|||
89
pkgs/applications/audio/hivelytracker/default.nix
Normal file
89
pkgs/applications/audio/hivelytracker/default.nix
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, SDL
|
||||
, SDL_image
|
||||
, SDL_ttf
|
||||
, gtk2
|
||||
, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hivelytracker";
|
||||
version = "unstable-2020-08-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pete-gordon";
|
||||
repo = "hivelytracker";
|
||||
rev = "c8e3c7a5ee9f4a07cb4a941caecf7e4c4f4d40e0";
|
||||
sha256 = "1nqianlf1msir6wqwapi7ys1vbmf6aik58wa54b6cn5v6kwxh75a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_image
|
||||
SDL_ttf
|
||||
gtk2
|
||||
glib
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"-C sdl"
|
||||
"-f Makefile.linux"
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
# TODO: try to exclude gtk and glib from darwin builds
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${SDL}/include/SDL"
|
||||
"-I${SDL_image}/include/SDL"
|
||||
"-I${SDL_ttf}/include/SDL"
|
||||
"-I${gtk2.dev}/include/gtk-2.0"
|
||||
"-I${glib.dev}/include/glib-2.0"
|
||||
];
|
||||
|
||||
# Also build the hvl2wav tool
|
||||
postBuild = ''
|
||||
make -C hvl2wav
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# https://github.com/pete-gordon/hivelytracker/issues/43
|
||||
# Ideally we should patch the sources, but the program can't open
|
||||
# files passed as arguments anyway, so this works well enough until the
|
||||
# issue is fixed.
|
||||
wrapProgram $out/bin/hivelytracker \
|
||||
--run "cd $out/share/hivelytracker"
|
||||
|
||||
# Also install the hvl2wav tool
|
||||
install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.hivelytracker.co.uk/";
|
||||
downloadPage = "http://www.hivelytracker.co.uk/downl.php";
|
||||
description = "Chip music tracker based upon the AHX format";
|
||||
longDescription = ''
|
||||
Hively Tracker is a tracker program based upon the AHX format created in
|
||||
the mid '90s by Dexter and Pink of Abyss. The format was relatively
|
||||
popular, and many songs were created and used in scene productions and
|
||||
games. AHX was designed to create a very SID-like sound on the Amiga.
|
||||
|
||||
HivelyTracker can import and export modules and instruments in the AHX
|
||||
format, but it also improves on AHX in several ways and therefore has
|
||||
its own instrument and module formats.
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
broken = stdenv.isDarwin; # TODO: try to use xcbuild
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mopidy-tunein";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-TuneIn";
|
||||
sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc";
|
||||
sha256 = "01y1asylscr73yqx071imhrzfzlg07wmqqzkdvpgm6r35marc2li";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, libtool, pkg-config, file, zip, wxGTK, gtk2
|
||||
, contribPlugins ? false, hunspell, gamin, boost
|
||||
{ lib, stdenv, fetchurl, pkg-config, file, zip, wxGTK30-gtk3, gtk3
|
||||
, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}";
|
||||
version = "17.12";
|
||||
version = "20.03";
|
||||
pname = "codeblocks";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.xz";
|
||||
sha256 = "1q2pph7md1p10i83rir2l4gvy7ym2iw8w6sk5vl995knf851m20k";
|
||||
url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks-${version}.tar.xz";
|
||||
sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config libtool file zip ];
|
||||
buildInputs = [ wxGTK gtk2 ]
|
||||
nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ];
|
||||
buildInputs = [ wxGTK30-gtk3 gtk3 ]
|
||||
++ optionals contribPlugins [ hunspell gamin boost ];
|
||||
enableParallelBuilding = true;
|
||||
patches = [ ./writable-projects.patch ];
|
||||
|
|
|
|||
|
|
@ -1,44 +1,46 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoPatchelfHook
|
||||
, wrapGAppsHook
|
||||
, hicolor-icon-theme
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.2";
|
||||
|
||||
dbusService = fetchurl {
|
||||
url = "https://github.com/phuhl/linux_notification_center/raw/${version}/com.ph-uhl.deadd.notification.service.in";
|
||||
sha256 = "0jvmi1c98hm8x1x7kw9ws0nbf4y56yy44c3bqm6rjj4lrm89l83s";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
pname = "deadd-notification-center";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phuhl/linux_notification_center/releases/download/${version}/${pname}";
|
||||
sha256 = "13f15slkjiw2n5dnqj13dprhqm3nf1k11jqaqda379yhgygyp9zm";
|
||||
src = fetchFromGitHub {
|
||||
owner = "phuhl";
|
||||
repo = "linux_notification_center";
|
||||
rev = version;
|
||||
sha256 = "QaOLrtlhQyhMOirk6JO1yMGRrgycHmF9FAdKNbN2TRk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
libxml2
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/dbus-1/services
|
||||
cp $src $out/bin/deadd-notification-center
|
||||
chmod +x $out/bin/deadd-notification-center
|
||||
|
||||
sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
|
||||
cp $src/.out/${pname} $out/bin/
|
||||
chmod +x $out/bin/${pname}
|
||||
|
||||
sed "s|##PREFIX##|$out|g" $src/${pname}.service.in > \
|
||||
$out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "8.0";
|
||||
version = "8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a";
|
||||
sha256 = "05wn4kmvsswwd2q2pffxbplb38capwv7iddsghix3r5zds13142z";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signumone-ks";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn-dist.signum.one/${version}/${pname}-${version}.deb";
|
||||
sha256 = "4efd80e61619ccf26df1292194fcec68eb14d77dfcf0a1a673da4cf5bf41f4b7";
|
||||
sha256 = "00wlya3kb6qac2crflm86km9r48r29bvngjq1wgzj9w2xv0q32b9";
|
||||
};
|
||||
|
||||
# Necessary to avoid using multiple ffmpeg and gtk libs
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
k3sVersion = "1.19.4-k3s1";
|
||||
k3sVersion = "1.20.0-k3s2";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gmailctl";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrt";
|
||||
repo = "gmailctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j";
|
||||
sha256 = "sha256-UZzpecW4vW1JYUDCcwDIJXCGjw80fgZC4wvCh0DdE98=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b";
|
||||
vendorSha256 = "sha256-5oVr1qazTzsSNVLvcAsAN8UyrJOeqLjSVinImLOyJlk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,28 @@
|
|||
{ stdenv, lib, fetchgit, autoreconfHook, readline }:
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, readline
|
||||
, withReadline ? true
|
||||
, enableEmu ? true
|
||||
, enableSpy ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ngadmin";
|
||||
version = "unstable-2017-11-17";
|
||||
version = "unstable-2020-10-05";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.netgeek.ovh/c/ngadmin.git";
|
||||
rev = "95240c567b5c40129d733cbd76911ba7574e4998";
|
||||
sha256 = "052ss82fs8cxk3dqdwlh3r8q9gsm36in2lxdgwj9sljdgwg75c34";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alkorin";
|
||||
repo = "ngadmin";
|
||||
rev = "5bf8650ce6d465b8cb1e570548819f0cefe9a87d";
|
||||
sha256 = "15vixhwqcpbjdxlaznans9w63kwl29mdkds6spvbv2i7l33qnhq4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook readline ];
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook ]
|
||||
++ lib.optional withReadline readline;
|
||||
enableParallelBuild = true;
|
||||
configureFlags = with lib;
|
||||
optional (!withReadline) "--without-readline"
|
||||
++ optional enableEmu "--enable-emu"
|
||||
++ optional enableSpy "--enable-spy";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Netgear switch (NSDP) administration tool";
|
||||
|
|
|
|||
24
pkgs/applications/snowmachine/default.nix
Normal file
24
pkgs/applications/snowmachine/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ buildPythonPackage, lib, click, colorama, fetchPypi, setuptools-git }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowmachine";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1v385hhxy2a8vx5p0fhn0di8l4qfpb0a86j6nwsg0aw6ngb09qf1";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools-git ];
|
||||
propagatedBuildInputs = [ click colorama ];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "snowmachine" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python script that will make your terminal snow";
|
||||
homepage = "http://github.com/sontek/snowmachine";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ djanatyn ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,20 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, libunwind
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gperftools-2.8";
|
||||
pname = "gperftools";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz";
|
||||
sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394";
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -29,8 +38,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile.am --replace stdc++ c++
|
||||
substituteInPlace Makefile.in --replace stdc++ c++
|
||||
substituteInPlace libtool --replace stdc++ c++
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libjcat";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "hughsie";
|
||||
repo = "libjcat";
|
||||
rev = version;
|
||||
sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh";
|
||||
sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
56
pkgs/development/python-modules/catboost/default.nix
Normal file
56
pkgs/development/python-modules/catboost/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder
|
||||
, clang_7, python2
|
||||
, graphviz, matplotlib, numpy, pandas, plotly, scipy, six
|
||||
, withCuda ? false, cudatoolkit }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "catboost";
|
||||
version = "0.24.4";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catboost";
|
||||
repo = "catboost";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang_7 python2 ];
|
||||
|
||||
propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ]
|
||||
++ lib.optional withCuda [ cudatoolkit ];
|
||||
|
||||
patches = [
|
||||
./nix-support.patch
|
||||
(fetchpatch {
|
||||
name = "format.patch";
|
||||
url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch";
|
||||
sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo=";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cd catboost/python-package
|
||||
'';
|
||||
setupPyBuildFlags = [ "--with-ymake=no" ];
|
||||
CUDA_ROOT = lib.optional withCuda cudatoolkit;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Tests use custom "ya" tool, not yet supported.
|
||||
dontUseSetuptoolsCheck = true;
|
||||
pythonImportsCheck = [ "catboost" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance library for gradient boosting on decision trees.";
|
||||
longDescription = ''
|
||||
A fast, scalable, high performance Gradient Boosting on Decision Trees
|
||||
library, used for ranking, classification, regression and other machine
|
||||
learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
homepage = "https://catboost.ai";
|
||||
maintainers = with maintainers; [ PlushBeaver ];
|
||||
};
|
||||
}
|
||||
181
pkgs/development/python-modules/catboost/nix-support.patch
Normal file
181
pkgs/development/python-modules/catboost/nix-support.patch
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py
|
||||
index 17f1d8ff14..07da618cd1 100644
|
||||
--- a/catboost/python-package/setup.py
|
||||
+++ b/catboost/python-package/setup.py
|
||||
@@ -80,7 +80,7 @@ class Helper(object):
|
||||
self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None
|
||||
self.os_sdk = 'local'
|
||||
self.with_ymake = True
|
||||
- self.parallel = None
|
||||
+ self.parallel = os.environ.get('NIX_BUILD_CORES') or None
|
||||
|
||||
def finalize_options(self):
|
||||
if os.path.exists(str(self.with_cuda)):
|
||||
@@ -222,11 +222,12 @@ class build_ext(_build_ext):
|
||||
|
||||
def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run):
|
||||
logging.info('Buildling {} with gnu make'.format(catboost_ext))
|
||||
- makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
|
||||
+ makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
|
||||
make_cmd = [
|
||||
'make', '-f', '../../make/' + makefile,
|
||||
- 'CC=clang-5.0',
|
||||
- 'CXX=clang++-5.0',
|
||||
+ 'CC=clang',
|
||||
+ 'CXX=clang++',
|
||||
+ 'PYTHON=python2',
|
||||
'BUILD_ROOT=' + build_dir,
|
||||
'SOURCE_ROOT=' + topsrc_dir,
|
||||
]
|
||||
diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile
|
||||
index e54b7078e8..fb7b208af9 100644
|
||||
--- a/make/python2.CLANG7-LINUX-X86_64.makefile
|
||||
+++ b/make/python2.CLANG7-LINUX-X86_64.makefile
|
||||
@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
|
||||
SOURCE_ROOT = $(shell pwd)
|
||||
PYTHON = $(shell which python)
|
||||
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CC_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
|
||||
-$(info _CC_VERSION = '$(_CC_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CC_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CXX_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
|
||||
-$(info _CXX_VERSION = '$(_CXX_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CXX_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-
|
||||
all\
|
||||
::\
|
||||
$(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
|
||||
diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
|
||||
index 2a22a79b25..522fb54a7c 100644
|
||||
--- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
|
||||
+++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
|
||||
@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
|
||||
SOURCE_ROOT = $(shell pwd)
|
||||
PYTHON = $(shell which python)
|
||||
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CC_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
|
||||
-$(info _CC_VERSION = '$(_CC_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CC_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CXX_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
|
||||
-$(info _CXX_VERSION = '$(_CXX_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CXX_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-
|
||||
all\
|
||||
::\
|
||||
$(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
|
||||
diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile
|
||||
index fee6750bcb..dc55908371 100644
|
||||
--- a/make/python3.CLANG7-LINUX-X86_64.makefile
|
||||
+++ b/make/python3.CLANG7-LINUX-X86_64.makefile
|
||||
@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
|
||||
SOURCE_ROOT = $(shell pwd)
|
||||
PYTHON = $(shell which python)
|
||||
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CC_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
|
||||
-$(info _CC_VERSION = '$(_CC_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CC_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CXX_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
|
||||
-$(info _CXX_VERSION = '$(_CXX_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CXX_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-
|
||||
all\
|
||||
::\
|
||||
$(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
|
||||
diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
|
||||
index 5146830476..ff8535b03e 100644
|
||||
--- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
|
||||
+++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
|
||||
@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
|
||||
SOURCE_ROOT = $(shell pwd)
|
||||
PYTHON = $(shell which python)
|
||||
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CC_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
|
||||
-$(info _CC_VERSION = '$(_CC_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CC_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-ifneq ($(MAKECMDGOALS),help)
|
||||
-define _CXX_TEST
|
||||
-__clang_major__ __clang_minor__
|
||||
-endef
|
||||
-
|
||||
-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
|
||||
-$(info _CXX_VERSION = '$(_CXX_VERSION)')
|
||||
-
|
||||
-ifneq '$(_CXX_VERSION)' '7 0'
|
||||
- $(error clang 7.0 is required)
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-
|
||||
all\
|
||||
::\
|
||||
$(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
|
||||
|
|
@ -1,21 +1,24 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchPypi
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
|
||||
, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
pname = "crccheck";
|
||||
version = "0.6";
|
||||
version = "1.0";
|
||||
in buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
||||
buildInputs = [ nose ];
|
||||
checkInputs = [ nose ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ckymm6s5kw08i1j35fy2cfha1hyq94pq1kc66brb552qgjs91jn";
|
||||
extension = "zip";
|
||||
sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for CRCs and checksums";
|
||||
homepage = "https://bitbucket.org/martin_scharrer/crccheck";
|
||||
homepage = "https://sourceforge.net/projects/crccheck/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ etu ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -6,21 +6,21 @@
|
|||
, makeFontsConf
|
||||
, freefont_ttf
|
||||
, mock
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
, pytestcov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphviz";
|
||||
version = "0.14.1";
|
||||
version = "0.16";
|
||||
|
||||
# patch does not apply to PyPI tarball due to different line endings
|
||||
src = fetchFromGitHub {
|
||||
owner = "xflr6";
|
||||
repo = "graphviz";
|
||||
rev = version;
|
||||
sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
|
||||
sha256 = "147vi60mi57z623lhllwwzczzicv2iwj1yrmllj5xx5788i73j6g";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -35,11 +35,7 @@ buildPythonPackage rec {
|
|||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
checkInputs = [ mock pytest pytest-mock pytestcov ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple Python interface for Graphviz";
|
||||
|
|
|
|||
|
|
@ -1,19 +1,28 @@
|
|||
diff --git a/graphviz/backend.py b/graphviz/backend.py
|
||||
index 6f4cc0c..bc4781e 100644
|
||||
index d2c4b97..f7175cd 100644
|
||||
--- a/graphviz/backend.py
|
||||
+++ b/graphviz/backend.py
|
||||
@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
|
||||
raise ValueError('unknown formatter: %r' % formatter)
|
||||
|
||||
output_format = [f for f in (format_, renderer, formatter) if f is not None]
|
||||
- cmd = [engine, '-T%s' % ':'.join(output_format)]
|
||||
+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
|
||||
- cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
|
||||
+ cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
|
||||
|
||||
if filepath is None:
|
||||
rendered = None
|
||||
@@ -255,7 +255,7 @@ def version():
|
||||
subprocess.CalledProcessError: If the exit status is non-zero.
|
||||
RuntimmeError: If the output cannot be parsed into a version number.
|
||||
@@ -275,7 +275,7 @@ def unflatten(source,
|
||||
if fanout and stagger is None:
|
||||
raise RequiredArgumentError('fanout given without stagger')
|
||||
|
||||
- cmd = ['unflatten']
|
||||
+ cmd = ['@graphviz@/bin/unflatten']
|
||||
if stagger is not None:
|
||||
cmd += ['-l', str(stagger)]
|
||||
if fanout:
|
||||
@@ -304,7 +304,7 @@ def version():
|
||||
Graphviz Release version entry format
|
||||
https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20
|
||||
"""
|
||||
- cmd = ['dot', '-V']
|
||||
+ cmd = ['@graphviz@/bin/dot', '-V']
|
||||
|
|
@ -21,10 +30,10 @@ index 6f4cc0c..bc4781e 100644
|
|||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT)
|
||||
diff --git a/tests/test_backend.py b/tests/test_backend.py
|
||||
index 9f307f5..e43bf5b 100644
|
||||
index d10ef1a..e4aba58 100644
|
||||
--- a/tests/test_backend.py
|
||||
+++ b/tests/test_backend.py
|
||||
@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
|
||||
@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
|
||||
m.decode.assert_called_once_with(encoding)
|
||||
|
||||
|
||||
|
|
@ -33,34 +42,43 @@ index 9f307f5..e43bf5b 100644
|
|||
@pytest.mark.usefixtures('empty_path')
|
||||
@pytest.mark.parametrize('func, args', [
|
||||
(render, ['dot', 'pdf', 'nonfilepath']),
|
||||
@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
|
||||
assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
|
||||
|
||||
- Popen.assert_called_once_with(['dot', '-Tpdf', '-O', 'nonfilepath'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
|
||||
- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
cwd=None, startupinfo=mocker.ANY)
|
||||
@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
|
||||
@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
|
||||
assert e.value.stdout is mocker.sentinel.out
|
||||
e.value.stdout = mocker.sentinel.new_stdout
|
||||
assert e.value.stdout is mocker.sentinel.new_stdout
|
||||
- Popen.assert_called_once_with(['dot', '-Tpng'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
|
||||
- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
|
||||
assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
|
||||
|
||||
- Popen.assert_called_once_with(['dot', '-Tpng'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
|
||||
- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
|
||||
@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen):
|
||||
proc.communicate.return_value = (b'nonresult', b'')
|
||||
|
||||
assert unflatten('nonsource') == 'nonresult'
|
||||
- Popen.assert_called_once_with(['unflatten'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/unflatten'],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
|
||||
with pytest.raises(RuntimeError, match=r'nonversioninfo'):
|
||||
version()
|
||||
|
||||
|
|
@ -69,7 +87,7 @@ index 9f307f5..e43bf5b 100644
|
|||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
startupinfo=mocker.ANY)
|
||||
@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
|
||||
@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
|
||||
|
||||
assert version() == expected
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,8 @@
|
|||
, lxml
|
||||
, networkx
|
||||
, dateutil
|
||||
, six
|
||||
, pydotplus
|
||||
, rdflib
|
||||
, pydot
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,28 +17,17 @@ buildPythonPackage rec {
|
|||
sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
networkx
|
||||
dateutil
|
||||
six
|
||||
pydotplus
|
||||
rdflib
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pydot
|
||||
glibcLocales
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export LC_ALL="en_US.utf-8"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library for W3C Provenance Data Model (PROV)";
|
||||
homepage = "https://github.com/trungdong/prov";
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyparsing
|
||||
, graphviz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydotplus";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyparsing
|
||||
graphviz
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/erocarrera/pydot";
|
||||
description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ashgillman ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,24 +1,28 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, sortedcontainers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sortedcollections";
|
||||
version = "1.2.3";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grantjenks";
|
||||
repo = "python-sortedcollections";
|
||||
rev = "v${version}";
|
||||
sha256 = "06ifkbhkj5fpsafibw0fs7b778g7q0gd03crvbjk04k0f3wjxc5z";
|
||||
sha256 = "sha256-GkZO8afUAgDpDjIa3dhO6nxykqrljeKldunKMODSXfg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sortedcontainers ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sortedcollections" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -263,6 +263,7 @@ let
|
|||
gmp = [ pkgs.gmp.dev ];
|
||||
graphscan = [ pkgs.gsl_1 ];
|
||||
gsl = [ pkgs.gsl_1 ];
|
||||
gert = [ pkgs.libgit2 ];
|
||||
haven = [ pkgs.libiconv pkgs.zlib.dev ];
|
||||
h5vc = [ pkgs.zlib.dev ];
|
||||
HiCseg = [ pkgs.gsl_1 ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxcfs";
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "lxcfs";
|
||||
rev = "lxcfs-${version}";
|
||||
sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv";
|
||||
sha256 = "sha256-gC1Q+kG/oKfYvuHVKstpRWfL/thsemULrimPrV/eeaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config help2man autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config
|
||||
{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config
|
||||
, zlib, bzip2, lzma, libgcrypt
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, qt48, qmake4Hook, flex }:
|
||||
{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }:
|
||||
|
||||
# At the time of committing this, the expression fails for me to cross-build in
|
||||
# both mingw32 and mingw64.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "2.5.1";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, windows, fetchurl }:
|
||||
{ lib, stdenv, windows, fetchurl }:
|
||||
|
||||
let
|
||||
version = "6.0.0";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
|
||||
{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wxMSW-2.8.11";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
|
||||
|
||||
let
|
||||
version = "3.10";
|
||||
version = "3.10.1";
|
||||
stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url =
|
||||
"https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
|
||||
sha256 = "4aYKZmXym1Tq/462PIgJb4sHGUclEkU0Ok1iQJ6u0aw=";
|
||||
sha256 = "sha256-VHlz8twsp7mSwZPatJkciHaDOP0r0EudeG5i3gjPUT8=";
|
||||
};
|
||||
|
||||
phpConfig = writeText "config.php" ''
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "monolith";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Y2Z";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16k5mp64a5l063rdj65hbpx414xv0bqdvhvz49k8018f2a2jj5xl";
|
||||
sha256 = "sha256-kCyfVeGTXBzdwmTTDJM1eaR6ANoIXAydj1ePmrZehqE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3";
|
||||
cargoSha256 = "sha256-juxaL/zjfqzFMqZe9tpevdjjVU7fPK8zalksAARWHC8=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
source 'https://rubygems.org'
|
||||
gemspec
|
||||
gem 'haste'
|
||||
|
|
|
|||
|
|
@ -1,38 +1,19 @@
|
|||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
haste (0.2.3)
|
||||
faraday (~> 0.9)
|
||||
json
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
diff-lcs (1.4.4)
|
||||
faraday (0.17.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
json (2.3.1)
|
||||
haste (0.2.3)
|
||||
faraday (~> 0.9)
|
||||
json
|
||||
json (2.5.1)
|
||||
multipart-post (2.1.1)
|
||||
rspec (3.9.0)
|
||||
rspec-core (~> 3.9.0)
|
||||
rspec-expectations (~> 3.9.0)
|
||||
rspec-mocks (~> 3.9.0)
|
||||
rspec-core (3.9.2)
|
||||
rspec-support (~> 3.9.3)
|
||||
rspec-expectations (3.9.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-mocks (3.9.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-support (3.9.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
haste!
|
||||
rspec
|
||||
haste
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
|
|
|||
|
|
@ -1,25 +1,13 @@
|
|||
{ lib
|
||||
, bundlerEnv
|
||||
, bundlerApp
|
||||
, buildRubyGem
|
||||
, ruby
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.2.3";
|
||||
deps = bundlerEnv rec {
|
||||
name = "haste-client-${version}";
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
};
|
||||
in
|
||||
buildRubyGem rec {
|
||||
name = "haste-client-${version}";
|
||||
inherit version;
|
||||
gemName = "haste";
|
||||
|
||||
source.sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q";
|
||||
|
||||
propagatedBuildInputs = [ deps ];
|
||||
bundlerApp rec {
|
||||
pname = "haste";
|
||||
gemdir = ./.;
|
||||
exes = [ "haste" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line interface to the AnyStyle Parser and Finder";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,4 @@
|
|||
{
|
||||
diff-lcs = {
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["multipart-post"];
|
||||
groups = ["default"];
|
||||
|
|
@ -172,159 +162,11 @@
|
|||
haste = {
|
||||
dependencies = ["faraday" "json"];
|
||||
groups = ["default"];
|
||||
platforms = [{
|
||||
engine = "maglev";
|
||||
} {
|
||||
engine = "maglev";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "1.8";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "1.8";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "1.9";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "1.9";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.0";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.0";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.1";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.1";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.2";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.2";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.3";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.3";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.4";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.4";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.5";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.5";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.6";
|
||||
} {
|
||||
engine = "maglev";
|
||||
version = "2.6";
|
||||
} {
|
||||
engine = "rbx";
|
||||
} {
|
||||
engine = "rbx";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "1.8";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "1.9";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.0";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.1";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.2";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.3";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.4";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.5";
|
||||
} {
|
||||
engine = "rbx";
|
||||
version = "2.6";
|
||||
} {
|
||||
engine = "ruby";
|
||||
} {
|
||||
engine = "ruby";
|
||||
} {
|
||||
engine = "ruby";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "1.8";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "1.8";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "1.9";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "1.9";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.0";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.0";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.1";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.1";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.2";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.2";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.3";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.3";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.4";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.4";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.5";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.5";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.6";
|
||||
} {
|
||||
engine = "ruby";
|
||||
version = "2.6";
|
||||
}];
|
||||
platforms = [];
|
||||
source = {
|
||||
path = ./.;
|
||||
type = "path";
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jaq0kvlxwvd0jq9pl707saqnaaal3dis13mqwfjbj121gr4hq4q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.3";
|
||||
};
|
||||
|
|
@ -482,10 +324,10 @@
|
|||
}];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.1";
|
||||
version = "2.5.1";
|
||||
};
|
||||
multipart-post = {
|
||||
groups = ["default"];
|
||||
|
|
@ -646,58 +488,4 @@
|
|||
};
|
||||
version = "2.1.1";
|
||||
};
|
||||
rspec = {
|
||||
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.0";
|
||||
};
|
||||
rspec-core = {
|
||||
dependencies = ["rspec-support"];
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xndkv5cz763wh30x7hdqw6k7zs8xfh0f86amra9agwn44pcqs0y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.2";
|
||||
};
|
||||
rspec-expectations = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bxkv25qmy39jqrdx35bfgw00g24qkssail9jlljm7hywbqvr9bb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.2";
|
||||
};
|
||||
rspec-mocks = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.1";
|
||||
};
|
||||
rspec-support = {
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dandh2fy1dfkjk8jf9v4azbbma6968bhh06hddv0yqqm8108jir";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.3";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.3.1";
|
||||
version = "5.0.0";
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l";
|
||||
sha256 = "13kgc84kyrypr0xy4xifrzqcy4qlvcxc7f0jy3n1xkjl3vhav7w3";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.0.0-2020-02-04";
|
||||
version = "6.0.0-2021-01-18"; # Also update the fetchurl link
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
|
|
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar";
|
||||
sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k";
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20210118.082537-4.jar";
|
||||
sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "emplace";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tversteeg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iPfE2z98j93zqK2uZ8R+Fy2qNOCH9oCxHgeedvs/onY=";
|
||||
sha256 = "sha256-74jv5GvBSErU5qjd4QmAK4JZhqFoqBf3cNxOGLIqt9U=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-62DHIIwloB+pPAZnOEfLJzAWrRJSxPp4IghBh6lRuc8=";
|
||||
cargoSha256 = "sha256-SPHXkvtUL6hdYOE1fUIQLEqWzn68RVBiu6zJQJ/3BxQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mirror installed software on multiple machines";
|
||||
|
|
|
|||
|
|
@ -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/6.0.25"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.26"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c
|
||||
ref: refs/tags/6.0.25
|
||||
revision: 0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48
|
||||
ref: refs/tags/6.0.26
|
||||
specs:
|
||||
metasploit-framework (6.0.25)
|
||||
metasploit-framework (6.0.26)
|
||||
actionpack (~> 5.2.2)
|
||||
activerecord (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
|
|
@ -31,9 +31,9 @@ GIT
|
|||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.26)
|
||||
metasploit-payloads (= 2.0.27)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.2)
|
||||
metasploit_payloads-mettle (= 1.0.5)
|
||||
mqtt
|
||||
msgpack
|
||||
nessus_rest
|
||||
|
|
@ -124,8 +124,8 @@ GEM
|
|||
arel-helpers (2.12.0)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.1.0)
|
||||
aws-partitions (1.415.0)
|
||||
aws-sdk-core (3.110.0)
|
||||
aws-partitions (1.417.0)
|
||||
aws-sdk-core (3.111.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
|
|
@ -136,7 +136,7 @@ GEM
|
|||
aws-sdk-iam (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.40.0)
|
||||
aws-sdk-kms (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.87.0)
|
||||
|
|
@ -174,7 +174,7 @@ GEM
|
|||
faraday-net_http (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ruby2_keywords
|
||||
faraday-net_http (1.0.0)
|
||||
faraday-net_http (1.0.1)
|
||||
faye-websocket (0.11.0)
|
||||
eventmachine (>= 0.12.0)
|
||||
websocket-driver (>= 0.5.1)
|
||||
|
|
@ -185,14 +185,14 @@ GEM
|
|||
http_parser.rb (0.6.0)
|
||||
i18n (1.8.7)
|
||||
concurrent-ruby (~> 1.0)
|
||||
io-console (0.5.6)
|
||||
irb (1.3.0)
|
||||
io-console (0.5.7)
|
||||
irb (1.3.2)
|
||||
reline (>= 0.1.5)
|
||||
jmespath (1.4.0)
|
||||
jsobfu (0.4.2)
|
||||
rkelly-remix
|
||||
json (2.5.1)
|
||||
loofah (2.8.0)
|
||||
loofah (2.9.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
metasm (1.0.4)
|
||||
|
|
@ -214,7 +214,7 @@ GEM
|
|||
activemodel (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
railties (~> 5.2.2)
|
||||
metasploit-payloads (2.0.26)
|
||||
metasploit-payloads (2.0.27)
|
||||
metasploit_data_models (4.1.1)
|
||||
activerecord (~> 5.2.2)
|
||||
activesupport (~> 5.2.2)
|
||||
|
|
@ -224,7 +224,7 @@ GEM
|
|||
pg
|
||||
railties (~> 5.2.2)
|
||||
recog (~> 2.0)
|
||||
metasploit_payloads-mettle (1.0.2)
|
||||
metasploit_payloads-mettle (1.0.5)
|
||||
method_source (1.0.0)
|
||||
mini_portile2 (2.5.0)
|
||||
minitest (5.14.3)
|
||||
|
|
@ -284,7 +284,7 @@ GEM
|
|||
recog (2.3.18)
|
||||
nokogiri
|
||||
redcarpet (3.5.1)
|
||||
reline (0.2.0)
|
||||
reline (0.2.2)
|
||||
io-console (~> 0.5)
|
||||
rex-arch (0.1.14)
|
||||
rex-text
|
||||
|
|
@ -312,7 +312,7 @@ GEM
|
|||
rex-arch
|
||||
rex-ole (0.1.7)
|
||||
rex-text
|
||||
rex-powershell (0.1.88)
|
||||
rex-powershell (0.1.89)
|
||||
rex-random_identifier
|
||||
rex-text
|
||||
ruby-rc4
|
||||
|
|
@ -330,13 +330,13 @@ GEM
|
|||
rex-socket
|
||||
rex-text
|
||||
rex-struct2 (0.1.3)
|
||||
rex-text (0.2.29)
|
||||
rex-text (0.2.31)
|
||||
rex-zip (0.1.4)
|
||||
rex-text
|
||||
rkelly-remix (0.0.7)
|
||||
ruby-macho (2.5.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
ruby2_keywords (0.0.2)
|
||||
ruby2_keywords (0.0.4)
|
||||
ruby_smb (2.0.7)
|
||||
bindata
|
||||
openssl-ccm
|
||||
|
|
@ -348,7 +348,7 @@ GEM
|
|||
sawyer (0.8.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (> 0.8, < 2.0)
|
||||
simpleidn (0.1.1)
|
||||
simpleidn (0.2.1)
|
||||
unf (~> 0.1.4)
|
||||
sinatra (2.1.0)
|
||||
mustermann (~> 1.0)
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.0.25";
|
||||
version = "6.0.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
|
||||
sha256 = "sha256-ayW0MsV3TQnta+bP9kNL6m3hFPrn6lbsiAbXw7WOmBA=";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -114,20 +114,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08";
|
||||
sha256 = "1difs2ynpizrq0jdww075camiagkkxncyfb1qi4s19hfsn8xp3j0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.415.0";
|
||||
version = "1.417.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4";
|
||||
sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.110.0";
|
||||
version = "3.111.2";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -154,10 +154,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4";
|
||||
sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.40.0";
|
||||
version = "1.41.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -364,10 +364,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d";
|
||||
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
};
|
||||
faye-websocket = {
|
||||
groups = ["default"];
|
||||
|
|
@ -434,20 +434,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp";
|
||||
sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
};
|
||||
irb = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y";
|
||||
sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.3.2";
|
||||
};
|
||||
jmespath = {
|
||||
groups = ["default"];
|
||||
|
|
@ -484,10 +484,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
|
||||
sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
};
|
||||
metasm = {
|
||||
groups = ["default"];
|
||||
|
|
@ -524,12 +524,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c";
|
||||
sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
|
||||
rev = "0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48";
|
||||
sha256 = "044qissw7mq6i3n5dsp7z8af2vga9d1zdkz6dgnhjkbpqlrb89bb";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.0.25";
|
||||
version = "6.0.26";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -546,10 +546,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb";
|
||||
sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.26";
|
||||
version = "2.0.27";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
|
|
@ -566,10 +566,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk";
|
||||
sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.2";
|
||||
version = "1.0.5";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default"];
|
||||
|
|
@ -936,10 +936,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1";
|
||||
sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
};
|
||||
rex-arch = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1036,10 +1036,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif";
|
||||
sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.88";
|
||||
version = "0.1.89";
|
||||
};
|
||||
rex-random_identifier = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1106,10 +1106,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536";
|
||||
sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.29";
|
||||
version = "0.2.31";
|
||||
};
|
||||
rex-zip = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1156,10 +1156,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
|
||||
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.2";
|
||||
version = "0.0.4";
|
||||
};
|
||||
ruby_smb = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1206,10 +1206,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w";
|
||||
sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.2.1";
|
||||
};
|
||||
sinatra = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
25
pkgs/tools/security/pwdsafety/default.nix
Normal file
25
pkgs/tools/security/pwdsafety/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pwdsafety";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qnkabgc2924qg9x1ij51jq7lnxzcj1ygdp3x4mzi9gl532i191w";
|
||||
};
|
||||
|
||||
vendorSha256 = "0avm4zwwqv476yrraaf5xkc1lac0mwnmzav5wckifws6r4x3xrsb";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool checking password safety";
|
||||
homepage = "https://github.com/edoardottt/pwdsafety";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -22434,6 +22434,8 @@ in
|
|||
|
||||
hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
|
||||
|
||||
hivelytracker = callPackage ../applications/audio/hivelytracker { };
|
||||
|
||||
hledger = haskell.lib.justStaticExecutables haskellPackages.hledger;
|
||||
hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd;
|
||||
hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest;
|
||||
|
|
@ -24191,6 +24193,8 @@ in
|
|||
|
||||
puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
|
||||
|
||||
pwdsafety = callPackage ../tools/security/pwdsafety { };
|
||||
|
||||
pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
|
||||
|
||||
qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };
|
||||
|
|
@ -29441,6 +29445,8 @@ in
|
|||
|
||||
snowsql = callPackage ../applications/misc/snowsql {};
|
||||
|
||||
snowmachine = python3Packages.callPackage ../applications/snowmachine {};
|
||||
|
||||
sidequest = callPackage ../applications/misc/sidequest {};
|
||||
|
||||
maphosts = callPackage ../tools/networking/maphosts {};
|
||||
|
|
|
|||
|
|
@ -1159,6 +1159,8 @@ in {
|
|||
|
||||
catalogue = callPackage ../development/python-modules/catalogue { };
|
||||
|
||||
catboost = callPackage ../development/python-modules/catboost { };
|
||||
|
||||
cbeams = callPackage ../misc/cbeams { };
|
||||
|
||||
cbor2 = callPackage ../development/python-modules/cbor2 { };
|
||||
|
|
@ -5278,8 +5280,6 @@ in {
|
|||
|
||||
pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; };
|
||||
|
||||
pydotplus = callPackage ../development/python-modules/pydotplus { };
|
||||
|
||||
pydrive = callPackage ../development/python-modules/pydrive { };
|
||||
|
||||
pydsdl = callPackage ../development/python-modules/pydsdl { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue