mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 15:56:50 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6f66eac9d1
43 changed files with 495 additions and 212 deletions
|
|
@ -151,6 +151,7 @@ in
|
|||
users.users.${cfg.user} = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
home = cfg.home;
|
||||
};
|
||||
|
||||
users.groups.${cfg.group} = {};
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x16-emulator";
|
||||
version = "38";
|
||||
version = "40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commanderx16";
|
||||
repo = pname;
|
||||
rev = "r${version}";
|
||||
sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE=";
|
||||
hash = "sha256-7ZzVd2NJCFNAFrS2cj6bxcq/AzO5VakoFX9o1Ac9egg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -21,8 +21,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D --mode 755 --target-directory $out/bin/ x16emu
|
||||
install -D --mode 444 --target-directory $out/share/doc/${pname} README.md
|
||||
|
||||
install -Dm 755 -t $out/bin/ x16emu
|
||||
install -Dm 444 -t $out/share/doc/${pname} README.md
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
description = "The official emulator of CommanderX16 8-bit computer";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = SDL2.meta.platforms;
|
||||
inherit (SDL2.meta) platforms;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,20 +2,24 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, cc65
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x16-rom";
|
||||
version = "38";
|
||||
version = "40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commanderx16";
|
||||
repo = pname;
|
||||
rev = "r${version}";
|
||||
sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI=";
|
||||
hash = "sha256-5oqttuTJiJOUENncOJipAar22OsI1uG3G69m+eYoSh0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cc65 ];
|
||||
nativeBuildInputs = [
|
||||
cc65
|
||||
python3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/
|
||||
|
|
@ -25,8 +29,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin
|
||||
install -D --mode 444 --target-directory $out/share/doc/${pname} README.md
|
||||
|
||||
install -Dm 444 -t $out/share/${pname} build/x16/rom.bin
|
||||
install -Dm 444 -t $out/share/doc/${pname} README.md
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
@ -35,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
description = "ROM file for CommanderX16 8-bit computer";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = cc65.meta.platforms;
|
||||
inherit (cc65.meta) platforms;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{ callPackage, libsForQt5 }:
|
||||
{ callPackage
|
||||
, libsForQt5
|
||||
}:
|
||||
|
||||
let
|
||||
stableVersion = "2.2.29";
|
||||
stableVersion = "2.2.31";
|
||||
previewVersion = stableVersion;
|
||||
addVersion = args:
|
||||
let version = if args.stable then stableVersion else previewVersion;
|
||||
|
|
@ -18,16 +20,13 @@ let
|
|||
});
|
||||
};
|
||||
commonOverrides = [
|
||||
(mkOverride "psutil" "5.8.0"
|
||||
"sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=")
|
||||
(mkOverride "jsonschema" "3.2.0"
|
||||
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
|
||||
(mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
|
||||
];
|
||||
};
|
||||
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
|
||||
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
|
||||
guiSrcHash = "04yqh0kq5pkmadcxf090ilh9sqqxajcg65nf7ai1iikxi3x7z3r8";
|
||||
serverSrcHash = "0p6q421rldmyqi0padssgrssf4d9mb5ifiqjm5y8vfhwfl5a2cqk";
|
||||
guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858=";
|
||||
serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw=";
|
||||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,16 @@
|
|||
{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
|
||||
{ stable
|
||||
, branch
|
||||
, version
|
||||
, sha256Hash
|
||||
, mkOverride
|
||||
, commonOverrides
|
||||
}:
|
||||
|
||||
{ lib, python3, fetchFromGitHub, wrapQtAppsHook }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
defaultOverrides = commonOverrides ++ [
|
||||
|
|
@ -34,21 +44,33 @@ in python.pkgs.buildPythonPackage rec {
|
|||
sha256 = sha256Hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
sentry-sdk psutil jsonschema # tox for check
|
||||
# Runtime dependencies
|
||||
sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools
|
||||
distro
|
||||
jsonschema
|
||||
psutil
|
||||
sentry-sdk
|
||||
setuptools
|
||||
sip_4 (pyqt5.override { withWebSockets = true; })
|
||||
];
|
||||
|
||||
doCheck = false; # Failing
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postFixup = ''
|
||||
wrapQtApp "$out/bin/gns3"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \
|
||||
--replace "sentry-sdk==" "sentry-sdk>=" \
|
||||
--replace "psutil==" "psutil>=" \
|
||||
--replace "distro==" "distro>=" \
|
||||
--replace "setuptools==" "setuptools>="
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,23 +1,20 @@
|
|||
{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
|
||||
{ stable
|
||||
, branch
|
||||
, version
|
||||
, sha256Hash
|
||||
, mkOverride
|
||||
, commonOverrides
|
||||
}:
|
||||
|
||||
{ lib, python3, fetchFromGitHub, packageOverrides ? self: super: {}
|
||||
}:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, packageOverrides ? self: super: {}
|
||||
}:
|
||||
|
||||
let
|
||||
defaultOverrides = commonOverrides ++ [
|
||||
(self: super: {
|
||||
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "aiofiles";
|
||||
version = "0.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tinche";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.0";
|
||||
|
||||
|
|
@ -51,16 +48,33 @@ in python.pkgs.buildPythonApplication {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \
|
||||
--replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \
|
||||
--replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \
|
||||
--replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \
|
||||
--replace "aiohttp==" "aiohttp>=" \
|
||||
--replace "aiofiles==" "aiofiles>=" \
|
||||
--replace "Jinja2==" "Jinja2>=" \
|
||||
--replace "sentry-sdk==" "sentry-sdk>=" \
|
||||
--replace "async-timeout==" "async-timeout>=" \
|
||||
--replace "psutil==" "psutil>=" \
|
||||
--replace "distro==" "distro>=" \
|
||||
--replace "py-cpuinfo==" "py-cpuinfo>=" \
|
||||
--replace "setuptools==" "setuptools>="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
aiohttp-cors yarl aiohttp multidict setuptools
|
||||
jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles
|
||||
prompt-toolkit py-cpuinfo
|
||||
aiofiles
|
||||
aiohttp
|
||||
aiohttp-cors
|
||||
async_generator
|
||||
distro
|
||||
jinja2
|
||||
jsonschema
|
||||
multidict
|
||||
prompt-toolkit
|
||||
psutil
|
||||
py-cpuinfo
|
||||
sentry-sdk
|
||||
setuptools
|
||||
yarl
|
||||
zipstream
|
||||
];
|
||||
|
||||
# Requires network access
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "14.9.2",
|
||||
"repo_hash": "sha256-+tZN6isOb7LtUVwGshx9TP+P42sftJmQGVk1L9UJqcY=",
|
||||
"version": "14.9.3",
|
||||
"repo_hash": "04a5z9dr8qs1vrgrdlw5sx5wjwjgqzgj7rqxy4lswycxglc8i1ad",
|
||||
"yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.9.2-ee",
|
||||
"rev": "v14.9.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.9.2",
|
||||
"GITALY_SERVER_VERSION": "14.9.3",
|
||||
"GITLAB_PAGES_VERSION": "1.56.1",
|
||||
"GITLAB_SHELL_VERSION": "13.24.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.9.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.9.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "14.9.2";
|
||||
version = "14.9.3";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eEo+WZ2N/5bLfvwJCNf9qt+h/V5dIVqCjVJeomzw/Ps=";
|
||||
sha256 = "sha256-D4Dgw2vqX5464ciYvTqagQG/uXt0Wm15ztdwbyJp1HM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.9.2";
|
||||
version = "14.9.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
23
pkgs/development/interpreters/zuo/default.nix
Normal file
23
pkgs/development/interpreters/zuo/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zuo";
|
||||
version = "unstable-2022-04-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "racket";
|
||||
repo = "zuo";
|
||||
rev = "2f3e23bd374f9a6504de6000989ebf2adf67c80c";
|
||||
sha256 = "sha256-TxX3iinfL1hXFlQlGQ7x52O6zvYoJYXrMfEfSL4Axig=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Tiny Racket for Scripting";
|
||||
homepage = "https://github.com/racket/zuo";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3, runCommand, makeWrapper, stress-ng }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
, stress-ng
|
||||
}:
|
||||
|
||||
lib.fix (self: stdenv.mkDerivation rec {
|
||||
pname = "graphene-hardened-malloc";
|
||||
version = "8";
|
||||
version = "11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrapheneOS";
|
||||
repo = "hardened_malloc";
|
||||
rev = version;
|
||||
sha256 = "sha256-+5kJb3hhuFTto7zsIymIXl3tpKUOm3v1DCY4EkAOCgo=";
|
||||
sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -20,7 +27,7 @@ lib.fix (self: stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
install -Dm444 -t $out/include include/*
|
||||
install -Dm444 -t $out/lib libhardened_malloc.so
|
||||
install -Dm444 -t $out/lib out/libhardened_malloc.so
|
||||
|
||||
mkdir -p $out/bin
|
||||
substitute preload.sh $out/bin/preload-hardened-malloc --replace "\$dir" $out/lib
|
||||
|
|
@ -41,21 +48,21 @@ lib.fix (self: stdenv.mkDerivation rec {
|
|||
# standalone executables. this includes disabling tests for
|
||||
# malloc_object_size, which doesn't make sense to use via LD_PRELOAD.
|
||||
buildPhase = ''
|
||||
pushd test/simple-memory-corruption
|
||||
pushd test
|
||||
make LDLIBS= LDFLAGS=-Wl,--unresolved-symbols=ignore-all CXXFLAGS=-lstdc++
|
||||
substituteInPlace test_smc.py \
|
||||
--replace 'test_malloc_object_size' 'dont_test_malloc_object_size' \
|
||||
--replace 'test_invalid_malloc_object_size' 'dont_test_invalid_malloc_object_size'
|
||||
popd # test/simple-memory-corruption
|
||||
popd # test
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/test
|
||||
cp -r test/simple-memory-corruption $out/test/simple-memory-corruption
|
||||
cp -r test $out/test
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${python3.interpreter} $out/bin/run-tests \
|
||||
--add-flags "-I -m unittest discover --start-directory $out/test/simple-memory-corruption"
|
||||
--add-flags "-I -m unittest discover --start-directory $out/test"
|
||||
'';
|
||||
};
|
||||
tests = {
|
||||
|
|
|
|||
23
pkgs/development/libraries/libkqueue/default.nix
Normal file
23
pkgs/development/libraries/libkqueue/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkqueue";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mheily";
|
||||
repo = "libkqueue";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qh1r95A/ngg4KWSVYlC8ldv2ClV+rRPNcJDH+aAGxHs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "kqueue(2) compatibility library";
|
||||
homepage = "https://github.com/mheily/libkqueue";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdal";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDAL";
|
||||
repo = "PDAL";
|
||||
rev = version;
|
||||
sha256 = "sha256-DKIraCyp8fcgnVp5dFrtQ4Wq96cQGC9SiAPLS6htUZc=";
|
||||
sha256 = "sha256-w9Fu4Op6OdaxdvOUM+glpJUEZq//EwRD2lqzYrMXk8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, boost
|
||||
, cmake
|
||||
, fftw
|
||||
|
|
@ -20,25 +19,17 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vigra";
|
||||
version = "1.11.1";
|
||||
version = "unstable-2022-01-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ukoethe";
|
||||
repo = "vigra";
|
||||
rev = "Version-${lib.replaceChars ["."] ["-"] version}";
|
||||
sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk=";
|
||||
rev = "093d57d15c8c237adf1704d96daa6393158ce299";
|
||||
sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
||||
# Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
|
||||
patches =
|
||||
let clangPatch = fetchurl {
|
||||
url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
|
||||
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi";
|
||||
};
|
||||
in [ clangPatch ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
boost
|
||||
|
|
@ -59,9 +50,6 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
|
||||
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
|
||||
|
||||
# fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Novel computer vision C++ library with customizable algorithms and data structures";
|
||||
homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-QElc4J2BxOFI+L9D/SVMiYeRVOmwrNTW65LgdBG0TbU=";
|
||||
sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,32 +1,47 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, nose
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Bottleneck";
|
||||
pname = "bottleneck";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-F2Sn9K1YxVhyPFQoR+s2erC7ttiApOXV7vMKDs5c7Oo=";
|
||||
pname = "Bottleneck";
|
||||
inherit version;
|
||||
hash = "sha256-F2Sn9K1YxVhyPFQoR+s2erC7ttiApOXV7vMKDs5c7Oo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" ""
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ pytest nose ];
|
||||
checkPhase = ''
|
||||
py.test -p no:warnings $out/${python.sitePackages}
|
||||
'';
|
||||
pytestFlagsArray = [
|
||||
"$out/${python.sitePackages}"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_make_c_files"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bottleneck"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast NumPy array functions written in C";
|
||||
description = "Fast NumPy array functions";
|
||||
homepage = "https://github.com/pydata/bottleneck";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ ];
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-plugins";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_plugins";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-oynDX1miBvBmiN22ILQH1Q2y+PmWOfBunjZmVSnlvKk=";
|
||||
sha256 = "sha256-0IAr91ql4ShjGQol3uc/erIHW6E1Vzj724JJ3NaLZUo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
42
pkgs/development/python-modules/fivem-api/default.nix
Normal file
42
pkgs/development/python-modules/fivem-api/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fivem-api";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6llrMGWbDRmysEw+B6B115hLS5xlktQEXiSHzPLbV5s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fivem"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for interacting with FiveM servers";
|
||||
homepage = "https://github.com/Sander0542/fivem-api";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/pysensibo/default.nix
Normal file
39
pkgs/development/python-modules/pysensibo/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysensibo";
|
||||
version = "1.0.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrey-git";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gXdyVEBcYCUOo8PHzsJLkjtnX1B1iRS/DAxdQDU3HaY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pysensibo"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for interacting with Sensibo";
|
||||
homepage = "https://github.com/andrey-git/pysensibo";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
, pytest-forked
|
||||
, pytest-localserver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rq
|
||||
, sanic
|
||||
, sanic-testing
|
||||
|
|
@ -40,14 +41,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.5.8";
|
||||
version = "1.5.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY=";
|
||||
hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -56,10 +59,12 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
asttokens
|
||||
blinker
|
||||
botocore
|
||||
bottle
|
||||
celery
|
||||
chalice
|
||||
django
|
||||
executing
|
||||
|
|
@ -67,25 +72,22 @@ buildPythonPackage rec {
|
|||
falcon
|
||||
flask_login
|
||||
gevent
|
||||
httpx
|
||||
jsonschema
|
||||
pure-eval
|
||||
pyramid
|
||||
pyspark
|
||||
pytest-django
|
||||
pytest-forked
|
||||
pytest-localserver
|
||||
pytestCheckHook
|
||||
rq
|
||||
sanic
|
||||
sanic-testing
|
||||
sqlalchemy
|
||||
tornado
|
||||
trytond
|
||||
werkzeug
|
||||
] ++ lib.optionals isPy3k [
|
||||
aiohttp
|
||||
celery
|
||||
httpx
|
||||
pyramid
|
||||
pyspark
|
||||
sanic
|
||||
sanic-testing
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlitedict";
|
||||
version = "1.7.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RaRe-Technologies";
|
||||
repo = "sqlitedict";
|
||||
rev = version;
|
||||
sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-8dmGn5h3NigCdDtnDYjpjntRpyjk7ivRp1B8x8nUgpE=";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ azure-core
|
||||
{ lib
|
||||
, stdenv
|
||||
, azure-core
|
||||
, bokeh
|
||||
, buildPythonPackage
|
||||
, click
|
||||
|
|
@ -9,7 +11,6 @@
|
|||
, GitPython
|
||||
, jsonref
|
||||
, jsonschema
|
||||
, lib
|
||||
, matplotlib
|
||||
, nbformat
|
||||
, pandas
|
||||
|
|
@ -22,6 +23,7 @@
|
|||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, scikit-learn
|
||||
|
|
@ -29,13 +31,15 @@
|
|||
, setproctitle
|
||||
, setuptools
|
||||
, shortuuid
|
||||
, stdenv
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wandb";
|
||||
version = "0.12.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
|
|
@ -62,6 +66,23 @@ buildPythonPackage rec {
|
|||
shortuuid
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
azure-core
|
||||
bokeh
|
||||
flask
|
||||
jsonref
|
||||
jsonschema
|
||||
matplotlib
|
||||
nbformat
|
||||
pandas
|
||||
pydantic
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
scikit-learn
|
||||
tqdm
|
||||
];
|
||||
|
||||
# wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf
|
||||
# for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to
|
||||
|
|
@ -112,26 +133,13 @@ buildPythonPackage rec {
|
|||
|
||||
# Disable test that fails on darwin due to issue with python3Packages.psutil:
|
||||
# https://github.com/giampaolo/psutil/issues/1219
|
||||
disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats";
|
||||
|
||||
checkInputs = [
|
||||
azure-core
|
||||
bokeh
|
||||
flask
|
||||
jsonref
|
||||
jsonschema
|
||||
matplotlib
|
||||
nbformat
|
||||
pandas
|
||||
pydantic
|
||||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
scikit-learn
|
||||
tqdm
|
||||
disabledTests = lib.optional stdenv.isDarwin [
|
||||
"test_tpu_system_stats"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "wandb" ];
|
||||
pythonImportsCheck = [
|
||||
"wandb"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI and library for interacting with the Weights and Biases API";
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.6.4";
|
||||
version = "5.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE=";
|
||||
sha256 = "0fpz63dfac1i6wwf5wp3v1vs3r5yzh05g95m5vidx56h0g4dcp44";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WL9bp77Q1cQakxaptw6ZHCq2+IAscMIDKkbQAHSCo1s=";
|
||||
hash = "sha256-UFvrtLVHGlWUlvA7KLDgaCydE/UoxtYV+8RqLblOdns=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem
|
||||
{ lib, stdenv, fetchurl, fetchpatch, fetchzip, makeWrapper, runCommand, makeDesktopItem
|
||||
, xonotic-data, copyDesktopItems
|
||||
, # required for both
|
||||
unzip, libjpeg, zlib, libvorbis, curl
|
||||
|
|
@ -64,6 +64,15 @@ let
|
|||
sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix to make darkplaces compile under GCC 11
|
||||
(fetchpatch {
|
||||
name = "fix-darkplaces-gcc11";
|
||||
url = "https://gitlab.com/xonotic/darkplaces/-/commit/5e9e998c1759bc0085c3273fc39f9ea6f72a7dc8.patch";
|
||||
sha256 = "sha256-s0JettSg0AYr8V2mXKJ2QU125bBcX1BAu/yDciTWC5o=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ libjpeg zlib libvorbis curl gmp ]
|
||||
++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ]
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-jira";
|
||||
version = "8.22.1";
|
||||
version = "8.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
|
||||
sha256 = "sha256-9cFSlvqbyLqgmNN0LbfdV2vfyIrHPBR8vLJAXe5cqV0=";
|
||||
sha256 = "sha256-j9JUIK4GOdY9rMLPZcWbjWUh/s2ZkoVEQBNAIqHhdYI=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Proprietary issue tracking product, also providing project management functions";
|
||||
homepage = "https://www.atlassian.com/software/jira";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ fpletz globin ciil megheaiulian ];
|
||||
maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -822,7 +822,8 @@
|
|||
fitbit
|
||||
];
|
||||
"fivem" = ps: with ps; [
|
||||
]; # missing inputs: fivem-api
|
||||
fivem-api
|
||||
];
|
||||
"fixer" = ps: with ps; [
|
||||
fixerio
|
||||
];
|
||||
|
|
@ -2291,7 +2292,8 @@
|
|||
aiosenseme
|
||||
];
|
||||
"sensibo" = ps: with ps; [
|
||||
]; # missing inputs: pysensibo
|
||||
pysensibo
|
||||
];
|
||||
"sensor" = ps: with ps; [
|
||||
fnvhash
|
||||
lru-dict
|
||||
|
|
@ -3281,6 +3283,7 @@
|
|||
"filter"
|
||||
"fireservicerota"
|
||||
"firmata"
|
||||
"fivem"
|
||||
"fjaraskupan"
|
||||
"flic"
|
||||
"flick_electric"
|
||||
|
|
@ -3567,6 +3570,7 @@
|
|||
"select"
|
||||
"sense"
|
||||
"senseme"
|
||||
"sensibo"
|
||||
"sensor"
|
||||
"sentry"
|
||||
"seventeentrack"
|
||||
|
|
|
|||
|
|
@ -107,6 +107,8 @@ stdenv.mkDerivation {
|
|||
NIX_CFLAGS_COMPILE = toString ([
|
||||
"-I${libxml2.dev}/include/libxml2"
|
||||
"-Wno-error=implicit-fallthrough"
|
||||
# fix build vts module on gcc11
|
||||
"-Wno-error=stringop-overread"
|
||||
] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations");
|
||||
|
||||
configurePlatforms = [];
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "postfix";
|
||||
version = "3.6.5";
|
||||
version = "3.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-MA+ogRzqINAdJcYZ01m/+rgmVucE2qcZ4MmvxOz/SAg=";
|
||||
hash = "sha256-CYpxT0EEaO/ibiGR3I8xy6RQfVv0iPVvnrVUXjaG8NY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper m4 ];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,39 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra
|
||||
, help2man, pkg-config, perl, texlive }:
|
||||
{ lib, stdenv, fetchzip
|
||||
, autoreconfHook
|
||||
, boost
|
||||
, freeglut
|
||||
, glew
|
||||
, gsl
|
||||
, lcms2
|
||||
, libpng
|
||||
, libtiff
|
||||
, libGLU
|
||||
, libGL
|
||||
, vigra
|
||||
, help2man
|
||||
, pkg-config
|
||||
, perl
|
||||
, texlive
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "enblend-enfuse";
|
||||
version = "4.2";
|
||||
version = "unstable-2022-03-06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enblend/${pname}-${version}.tar.gz";
|
||||
sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
|
||||
src = fetchzip {
|
||||
url = "https://sourceforge.net/code-snapshots/hg/e/en/enblend/code/enblend-code-0f423c72e51872698fe2985ca3bd453961ffe4e0.zip";
|
||||
sha256 = "sha256-0gCUSdg3HR3YeIbOByEBCZh2zGlYur6DeCOzUM53fdc=";
|
||||
stripRoot = true;
|
||||
};
|
||||
|
||||
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ];
|
||||
|
||||
nativeBuildInputs = [ help2man perl pkg-config texlive.combined.scheme-small ];
|
||||
nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texlive.combined.scheme-small ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs src/embrace
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://enblend.sourceforge.net/";
|
||||
description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
|
||||
|
|
|
|||
23
pkgs/tools/graphics/pngtools/default.nix
Normal file
23
pkgs/tools/graphics/pngtools/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, libpng12, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "pngtools";
|
||||
version = "unstable-2022-03-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikalstill";
|
||||
repo = "pngtools";
|
||||
rev = "1ccca3a0f3f6882661bbafbfb62feb774ca195d1";
|
||||
sha256 = "sha256-W1XofOVTyfA7IbxOnTkWdOOZ00gZ4e0GOYl7nMtLIJk=";
|
||||
};
|
||||
|
||||
buildInputs = [ libpng12 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mikalstill/pngtools";
|
||||
description = "PNG manipulation tools";
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "github-backup";
|
||||
version = "0.40.1";
|
||||
version = "0.41.0";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Qrj0+4WXlW0UgG2xV/P8e0QgUG3VurY4HIAiiUF3LW8=";
|
||||
sha256 = "6e6462125b930de4d28efed7ee0d4377e77371a4918768436c3cecf79cc87078";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
|
|||
pname = "plantuml";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
|
||||
sha256 = "sha256-u40P3YFiWd419Bz1NvhIsPa7nASl/I9z/L2Q5v9eOAo=";
|
||||
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
|
||||
sha256 = "sha256-6ad6CUz1UAvNkhdUJhOME7OsLpIXiBoERfTmowzTz64=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-du";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symphorien";
|
||||
repo = "nix-du";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NnoCoiYTXci7f9MXsxEhoYHwPsaAAuK2wSrDye2+SYM=";
|
||||
sha256 = "sha256-LOs+geYOiAigxwc4VD0FiZQjAnIrcV9ncyPuwGhS92E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-X5181gZtvnUHZAqMjNARRVFq12LuLJfPP5ZOWxBRxXk=";
|
||||
cargoSha256 = "sha256-aEm+SQgE63ZWpb2kXavyoiq2rVkaebFw8kqWPMr2aMA=";
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ nix graphviz ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-04-20";
|
||||
version = "2022-04-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8sDixCXJA1K6hnPtLzNCB9gJh1GShCC89VTCJ63ohKA=";
|
||||
sha256 = "sha256-KAbPiZ/iOwT8plqqZ4Q3Cl8+we2Tsi2GkkmXZCcmhHs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
pythonPath = with python3.pkgs;
|
||||
lib.optionals stdenv.isLinux [
|
||||
systemd
|
||||
pyinotify
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -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.1.38"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.39"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 295599a02453423ea06e25c7f4347d88d1f2debc
|
||||
ref: refs/tags/6.1.38
|
||||
revision: e1016aceec3bfd4aff85d0bcdc89ee7c88cf5bd4
|
||||
ref: refs/tags/6.1.39
|
||||
specs:
|
||||
metasploit-framework (6.1.38)
|
||||
metasploit-framework (6.1.39)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -76,7 +76,7 @@ GIT
|
|||
rex-text
|
||||
rex-zip
|
||||
ruby-macho
|
||||
ruby_smb (~> 3.0)
|
||||
ruby_smb (~> 3.1.0)
|
||||
rubyntlm
|
||||
rubyzip
|
||||
sinatra
|
||||
|
|
@ -129,31 +129,31 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.577.0)
|
||||
aws-sdk-core (3.130.1)
|
||||
aws-partitions (1.579.0)
|
||||
aws-sdk-core (3.130.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.307.0)
|
||||
aws-sdk-ec2 (1.308.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.68.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.55.0)
|
||||
aws-sdk-kms (1.56.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.113.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
aws-sigv4 (1.4.0)
|
||||
aws-sigv4 (1.5.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
bcrypt (3.1.17)
|
||||
bcrypt_pbkdf (1.1.0)
|
||||
bindata (2.4.10)
|
||||
bson (4.14.1)
|
||||
bson (4.15.0)
|
||||
builder (3.2.4)
|
||||
concurrent-ruby (1.0.5)
|
||||
cookiejar (0.3.3)
|
||||
|
|
@ -388,7 +388,7 @@ GEM
|
|||
ruby-macho (3.0.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
ruby2_keywords (0.0.5)
|
||||
ruby_smb (3.1.0)
|
||||
ruby_smb (3.1.1)
|
||||
bindata
|
||||
openssl-ccm
|
||||
openssl-cmac
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.38";
|
||||
version = "6.1.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-3wpO2+ALt5sw6TSGCp7ARn5TEHVi+bBgP4uJPRwVIOM=";
|
||||
sha256 = "sha256-Idhxk9wNnWZmrY33afgkIicnSO3wWnqjiXYUFbXbERE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,30 +104,30 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rl0wcvcl1dnyzyxs0m6iyma0ibx2f9a2d4zac6hrdfcqf4s6zx9";
|
||||
sha256 = "1ilhspsph7icrrz94f3qngjkj585hsyv9bnxr44iabcqqwymr79w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.577.0";
|
||||
version = "1.579.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lrmk788830adljzfdv9ws4q7cqfh0qyp7w908pja4rkgsd4baln";
|
||||
sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.130.1";
|
||||
version = "3.130.2";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13dbg60p44llx4h99s6vdqngkwkx1521ixvzrlj630wrjp6dfkp2";
|
||||
sha256 = "0bqrgdw8kiy1pg3v4by1siqqhmjffr2xi5s0l5wj6l7z87n9wi9g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.307.0";
|
||||
version = "1.308.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -144,10 +144,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";
|
||||
sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.55.0";
|
||||
version = "1.56.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -164,10 +164,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
|
||||
sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
bcrypt = {
|
||||
groups = ["default"];
|
||||
|
|
@ -204,10 +204,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03n3w96vpblaxvk1qk8hq7sbsmg4nv7qdkdr8f7nfvalgpakp5i5";
|
||||
sha256 = "19vgs9rzzyvd7jfrzynjnc6518q0ffpfciyicfywbp77zl8nc9hk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.14.1";
|
||||
version = "4.15.0";
|
||||
};
|
||||
builder = {
|
||||
groups = ["default"];
|
||||
|
|
@ -694,12 +694,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "295599a02453423ea06e25c7f4347d88d1f2debc";
|
||||
sha256 = "1qr02lf3v2cb7xhb1yb2fl856zj6q2g0m1ilx4q9pdqbw3dlw2nz";
|
||||
rev = "e1016aceec3bfd4aff85d0bcdc89ee7c88cf5bd4";
|
||||
sha256 = "048ivfsia53ni6iplnphxm42f9r24kw6kxwdmmk6d78dvj9p3n11";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.38";
|
||||
version = "6.1.39";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1387,10 +1387,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j378l0zh3y2hdnxx753p2ds7nssi8v08fkv1wzm3yl5ws8zkxaf";
|
||||
sha256 = "1v0dvys954c1d5azzz05p1jg57knk3d10b61wwfx00dw8pz76amw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
};
|
||||
rubyntlm = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -1,34 +1,62 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, cudatoolkit
|
||||
, libdrm
|
||||
, ncurses
|
||||
, addOpenGLRunpath
|
||||
, amd ? true
|
||||
, nvidia ? true
|
||||
}:
|
||||
|
||||
let
|
||||
pname-suffix = if amd && nvidia then "" else if amd then "-amd" else "-nvidia";
|
||||
nvidia-postFixup = "addOpenGLRunpath $out/bin/nvtop";
|
||||
libPath = lib.makeLibraryPath [ libdrm ncurses ];
|
||||
amd-postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${libPath}" \
|
||||
$out/bin/nvtop
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvtop";
|
||||
version = "1.2.2";
|
||||
pname = "nvtop" + pname-suffix;
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Syllo";
|
||||
repo = "nvtop";
|
||||
rev = version;
|
||||
sha256 = "sha256-B/SRTOMp3VYShjSGxnF1ll58ijddJG7w/7nPK1fMltk=";
|
||||
sha256 = "sha256-4Alc5pBXb38PUhTRhdKZMiW+P3daDB0q3jiVL8qqEe4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
|
||||
"-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so"
|
||||
cmakeFlags = with lib; [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
];
|
||||
] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
|
||||
++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so"
|
||||
++ optional (!amd) "-DAMDGPU_SUPPORT=OFF"
|
||||
++ optional (!nvidia) "-DNVIDIA_SUPPORT=OFF"
|
||||
++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2"
|
||||
;
|
||||
nativeBuildInputs = [ cmake] ++ lib.optional nvidia addOpenGLRunpath;
|
||||
buildInputs = with lib; [ ncurses ]
|
||||
++ optional nvidia cudatoolkit
|
||||
++ optional amd libdrm
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||
buildInputs = [ ncurses cudatoolkit ];
|
||||
|
||||
postFixup = ''
|
||||
addOpenGLRunpath $out/bin/nvtop
|
||||
'';
|
||||
# ordering of fixups is important
|
||||
postFixup = (lib.optionalString amd amd-postFixup) + (lib.optionalString nvidia nvidia-postFixup);
|
||||
|
||||
meta = with lib; {
|
||||
description = "A (h)top like task monitor for NVIDIA GPUs";
|
||||
description = "A (h)top like task monitor for AMD and NVIDIA GPUs";
|
||||
longDescription = ''
|
||||
Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way.
|
||||
'';
|
||||
homepage = "https://github.com/Syllo/nvtop";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ willibutz ];
|
||||
maintainers = with maintainers; [ willibutz gbtb ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9341,6 +9341,8 @@ with pkgs;
|
|||
libpng = libpng12;
|
||||
};
|
||||
|
||||
pngtools = callPackage ../tools/graphics/pngtools { };
|
||||
|
||||
pngpp = callPackage ../development/libraries/png++ { };
|
||||
|
||||
pngquant = callPackage ../tools/graphics/pngquant { };
|
||||
|
|
@ -14144,6 +14146,8 @@ with pkgs;
|
|||
|
||||
wabt = callPackage ../development/tools/wabt { };
|
||||
|
||||
zuo = callPackage ../development/interpreters/zuo { };
|
||||
|
||||
### LUA interpreters
|
||||
luaInterpreters = callPackage ./../development/interpreters/lua-5 {};
|
||||
inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0;
|
||||
|
|
@ -18600,6 +18604,8 @@ with pkgs;
|
|||
|
||||
libivykis = callPackage ../development/libraries/libivykis { };
|
||||
|
||||
libkqueue = callPackage ../development/libraries/libkqueue { };
|
||||
|
||||
liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
|
||||
|
||||
liblcf = callPackage ../development/libraries/liblcf { };
|
||||
|
|
@ -19720,6 +19726,8 @@ with pkgs;
|
|||
nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
|
||||
|
||||
nvtop = callPackage ../tools/system/nvtop { };
|
||||
nvtop-nvidia = callPackage ../tools/system/nvtop { amd = false; };
|
||||
nvtop-amd = callPackage ../tools/system/nvtop { nvidia = false; };
|
||||
|
||||
ocl-icd = callPackage ../development/libraries/ocl-icd { };
|
||||
|
||||
|
|
|
|||
|
|
@ -2930,6 +2930,8 @@ in {
|
|||
|
||||
fitbit = callPackage ../development/python-modules/fitbit { };
|
||||
|
||||
fivem-api = callPackage ../development/python-modules/fivem-api { };
|
||||
|
||||
fixerio = callPackage ../development/python-modules/fixerio { };
|
||||
|
||||
fixtures = callPackage ../development/python-modules/fixtures { };
|
||||
|
|
@ -7745,6 +7747,8 @@ in {
|
|||
|
||||
pysendfile = callPackage ../development/python-modules/pysendfile { };
|
||||
|
||||
pysensibo = callPackage ../development/python-modules/pysensibo { };
|
||||
|
||||
pysensors = callPackage ../development/python-modules/pysensors { };
|
||||
|
||||
pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue