alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-06-11 12:01:21 +00:00 committed by GitHub
parent f13315dd4c f828475636
commit 1ff1108cce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 447 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/graphics/gcolor2/default.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, gtk2, perlPackages, pkg-config } :
{lib, stdenv, fetchurl, fetchpatch, gtk2, perlPackages, pkg-config } :
let version = "0.4"; in
stdenv.mkDerivation {
@ -16,9 +16,18 @@ stdenv.mkDerivation {
'';
# from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches
patches = if stdenv.hostPlatform.system == "x86_64-linux" then
patches = (if stdenv.hostPlatform.system == "x86_64-linux" then
[ ./gcolor2-amd64.patch ] else
[ ];
[ ])
++ [
# Pull patch pending upstream inclusion for -fno-common toolchains:
# https://sourceforge.net/p/gcolor2/patches/8/
(fetchpatch {
name = "fno-common.patch";
url = "https://sourceforge.net/p/gcolor2/patches/8/attachment/0001-gcolor2-fix-build-on-gcc-10-fno-common.patch";
sha256 = "0187zc8as9g3d6mpm3isg87jfpryj0hajb4inwvii8gxrzbi5l5f";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ]

4
pkgs/applications/misc/dbeaver/default.nix
View file

@ -23,13 +23,13 @@
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
}) rec {
pname = "dbeaver";
version = "22.0.5"; # When updating also update mvnSha256
version = "22.1.0"; # When updating also update mvnSha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-P+t1wtMTVKbfEXCFuz8zPNy3z4YysJRyOvTxiDFlp2c=";
sha256 = "sha256-gMs9q0+Yy/2l8TEG9vIuzv0qOh7QwawwlXKr3/Mz8wk=";
};
mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI=";

6
pkgs/applications/networking/ipfs/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchurl, nixosTests }:
{ lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }:
buildGoModule rec {
pname = "ipfs";
@ -25,6 +25,10 @@ buildGoModule rec {
subPackages = [ "cmd/ipfs" ];
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
tags = [ "openssl" ];
passthru.tests.ipfs = nixosTests.ipfs;
vendorSha256 = null;

5
pkgs/applications/networking/offrss/default.nix
View file

@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
++ lib.optional (!stdenv.isLinux) libiconv;
# Workaround build failure on -fno-common toolchains:
# ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path';
# offrss.o:offrss.h:75: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
configurePhase = ''
substituteInPlace Makefile \
--replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)'

16
pkgs/applications/science/electronics/geda/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }:
stdenv.mkDerivation {
pname = "geda";
@ -9,6 +9,20 @@ stdenv.mkDerivation {
sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";
};
patches = [
# Pull upstream patch for -fno-common toolchains
(fetchpatch {
name = "fno-common-p1.patch";
url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6";
sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq";
})
(fetchpatch {
name = "fno-common-p2.patch";
url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158";
sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k";
})
];
configureFlags = [
"--disable-update-xdg-database"
];

2
pkgs/development/compilers/dtc/default.nix
View file

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Device Tree Compiler";
homepage = "https://git.kernel.org/cgit/utils/dtc/dtc.git";
homepage = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
license = licenses.gpl2Plus; # dtc itself is GPLv2, libfdt is dual GPL/BSD
maintainers = [ maintainers.dezgeg ];
platforms = platforms.unix;

4
pkgs/development/libraries/gspell/default.nix
View file

@ -16,14 +16,14 @@
stdenv.mkDerivation rec {
pname = "gspell";
version = "1.10.0";
version = "1.11.1";
outputs = [ "out" "dev" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "gDu4hMAhXT/SKoXX8wQjr/iNl5LwWlGZ2KSJov+q4do=";
sha256 = "72qk4/cRd1FYp+JBpfgJzyQmvA4Cwjp9K1xx/D3gApI=";
};
patches = [

4
pkgs/development/python-modules/awscrt/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.13.11";
version = "0.13.13";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Yx3I3RD57Nx6Cvm4moc5zmMbdsHeYiMghDfbQUor38E=";
hash = "sha256-4kCn5tydt56L22UvWQvhLcLVr31UH+oMfdjhtL9U/eI=";
};
buildInputs = lib.optionals stdenv.isDarwin [

4
pkgs/development/python-modules/neo4j-driver/default.nix → pkgs/development/python-modules/neo4j/default.nix
View file

@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
pname = "neo4j-driver";
pname = "neo4j";
version = "4.4.4";
format = "setuptools";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = version;
sha256 = "sha256-Sd+ZeyJCzqGsBl3rdxfKPD0gYZ49qAfiRbuXaNGpj8M=";
hash = "sha256-Sd+ZeyJCzqGsBl3rdxfKPD0gYZ49qAfiRbuXaNGpj8M=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/peaqevcore/default.nix
View file

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.3.14";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-cIm4ADZSVbE+Hb23AjKs6vADnIQNFPJjFj3Ex7INnwo=";
hash = "sha256-s7vJ4rAOQPZBhCA8Q+ZJl6RBTBmP90XA9c6B/xwoHU0=";
};
postPatch = ''

44
pkgs/development/python-modules/psrpcore/default.nix Normal file
View file

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, xmldiff
}:
buildPythonPackage rec {
pname = "psrpcore";
version = "0.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
hash = "sha256-f1NGE+wSgi8yqBicZZRfUqzinsqazuIaoAje2y+dK1w=";
};
propagatedBuildInputs = [
cryptography
];
checkInputs = [
pytestCheckHook
xmldiff
];
pythonImportsCheck = [
"psrpcore"
];
meta = with lib; {
description = "Library for the PowerShell Remoting Protocol (PSRP)";
homepage = "https://github.com/jborean93/psrpcore";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

79
pkgs/development/python-modules/pypsrp/default.nix Normal file
View file

@ -0,0 +1,79 @@
{ lib
, asyncssh
, buildPythonPackage
, cryptography
, fetchFromGitHub
, gssapi
, httpcore
, httpx
, krb5
, psrpcore
, psutil
, pyspnego
, pytest-mock
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, requests-credssp
, xmldiff
}:
buildPythonPackage rec {
pname = "pypsrp";
version = "0.8.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU=";
};
propagatedBuildInputs = [
cryptography
httpcore
httpx
psrpcore
pyspnego
requests
];
checkInputs = [
pytest-mock
pytestCheckHook
pyyaml
xmldiff
];
passthru.optional-dependencies = {
credssp = [
requests-credssp
];
kerberos = [
# pyspnego[kerberos] will have those two dependencies
gssapi
krb5
];
named_pipe = [
psutil
];
ssh = [
asyncssh
];
};
pythonImportsCheck = [
"pypsrp"
];
meta = with lib; {
description = "PowerShell Remoting Protocol Client library";
homepage = "https://github.com/jborean93/pypsrp";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

55
pkgs/development/python-modules/pywerview/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, beautifulsoup4
, buildPythonPackage
, fetchFromGitHub
, gssapi
, impacket
, ldap3
, lxml
, pyasn1
, pythonOlder
}:
buildPythonPackage rec {
pname = "pywerview";
version = "0.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "the-useless-one";
repo = pname;
rev = "v${version}";
hash = "sha256-nrPhyBHW13dkXFC5YJfrkiztAxMw4KuEif0zCdjQEq0=";
};
propagatedBuildInputs = [
beautifulsoup4
gssapi
impacket
ldap3
lxml
pyasn1
];
# Module has no tests
doCheck = false;
postPatch = ''
# https://github.com/the-useless-one/pywerview/pull/51
substituteInPlace setup.py \
--replace "bs4" "beautifulsoup4"
'';
pythonImportsCheck = [
"pywerview"
];
meta = with lib; {
description = "Module for PowerSploit's PowerView support";
homepage = "https://github.com/the-useless-one/pywerview";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fab ];
};
}

55
pkgs/development/python-modules/requests-credssp/default.nix Normal file
View file

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, gssapi
, krb5
, pyspnego
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "requests-credssp";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
hash = "sha256-HHLEmQ+mNjMjpR6J+emrKFM+2PiYq32o7Gnoo0gUrNA=";
};
propagatedBuildInputs = [
cryptography
pyspnego
requests
];
checkInputs = [
pytestCheckHook
];
passthru.optional-dependencies = {
kerberos = [
# pyspnego[kerberos] will have those two dependencies
gssapi
krb5
];
};
pythonImportsCheck = [
"requests_credssp"
];
meta = with lib; {
description = "HTTPS CredSSP authentication with the requests library";
homepage = "https://github.com/jborean93/requests-credssp";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

7
pkgs/development/python-modules/vmprof/default.nix
View file

@ -25,6 +25,13 @@ buildPythonPackage rec {
doCheck = false;
pythonImportsCheck = [ "vmprof" ];
# Workaround build failure on -fno-common toolchains:
# ld: src/vmprof_unix.o:src/vmprof_common.h:92: multiple definition of
# `_PyThreadState_Current'; src/_vmprof.o:src/vmprof_common.h:92: first defined here
# TODO: can be removed once next release contains:
# https://github.com/vmprof/vmprof-python/pull/203
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
description = "A vmprof client";

2
pkgs/development/tools/analysis/sparse/default.nix
View file

@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Semantic parser for C";
homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
homepage = "https://git.kernel.org/pub/scm/devel/sparse/sparse.git/";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice jkarlson ];

2
pkgs/development/tools/misc/pahole/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];
meta = with lib; {
homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/";
homepage = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/";
description = "Pahole and other DWARF utils";
license = licenses.gpl2Only;

17
pkgs/games/angband/default.nix
View file

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses5
, enableSdl2 ? false, SDL2, SDL2_image, SDL2_sound, SDL2_mixer, SDL2_ttf
}:
stdenv.mkDerivation rec {
pname = "angband";
@ -11,8 +13,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Fp3BGCZYYdQCKXOLYsT4zzlibNRlbELZi26ofrbGGPQ=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ncurses5 ];
buildInputs = [ ncurses5 ]
++ lib.optionals enableSdl2 [
SDL2
SDL2_image
SDL2_sound
SDL2_mixer
SDL2_ttf
];
configureFlags = lib.optional enableSdl2 "--enable-sdl2";
installFlags = [ "bindir=$(out)/bin" ];
meta = with lib; {

10
pkgs/games/speed-dreams/default.nix
View file

@ -3,7 +3,7 @@ libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, ex
libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl }:
let
version = "2.2.2-r6553";
version = "2.2.3-r7616";
shortVersion = builtins.substring 0 5 version;
in
stdenv.mkDerivation rec {
@ -12,22 +12,22 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz";
sha256 = "1l47d2619kpfkvdwbkwr311qss6jjfwvgl5h9z2w3bwdgz0mbaij";
sha256 = "sha256-GvB8SDZB9UivJSsQfMMon9N5MURdxTOwsaN4F0XQUCE=";
};
cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
sha256 = "0l8ba5pzqqcfy4inyxy2lrrhhgfs43xab7fy751xz2xqpqpfksyq";
sha256 = "sha256-BuryCUvBD7rKmApCNsTkRN0UJ1q6P3sdYrSzpTqdTHc=";
};
more-cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
sha256 = "10w180mhhk6dw4cza6mqa0hp5qgym9lcizfwykqbgcvs01yl2yqb";
sha256 = "sha256-GSCHYbJS352yAMczzss7tYSQXwLQV68rv/XkyGy+GoY=";
};
wip-cars-and-tracks = fetchurl {
url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
sha256 = "1wad9yaydaryhyi7ckyaii124h0z7kziqgcl475a5jr7ggbxc24q";
sha256 = "sha256-r/IOSf+UZg2e+WIHn2QNDO6qQUhpIJvh7EF2jQ7lyyA=";
};
sourceRoot = ".";

6
pkgs/misc/drivers/foo2zjs/default.nix
View file

@ -13,11 +13,15 @@ stdenv.mkDerivation rec {
patches = [
./no-hardcode-fw.diff
# Support HBPL1 printers https://www.dechifro.org/hbpl/
# Support HBPL1 printers. Updated patch based on
# https://www.dechifro.org/hbpl/
./hbpl1.patch
# Fix "Unimplemented paper code" error for hbpl1 printers
# https://github.com/mikerr/foo2zjs/pull/2
./papercode-format-fix.patch
# Fix AirPrint color printing for Dell 1250c
# See https://github.com/OpenPrinting/cups/issues/272
./dell1250c-color-fix.patch
];
makeFlags = [

29
pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch Normal file
View file

@ -0,0 +1,29 @@
diff --git a/PPD/Dell-1250c.ppd b/PPD/Dell-1250c.ppd
index 828ecd6..98f49e1 100644
--- a/PPD/Dell-1250c.ppd
+++ b/PPD/Dell-1250c.ppd
@@ -92,15 +92,15 @@
*FoomaticRIPOptionSetting Quality=normal: " "
*CloseUI: *Quality
-*OpenUI *ColorMode/Color Mode: PickOne
-*FoomaticRIPOption ColorMode: enum CmdLine A
-*OrderDependency: 120 AnySetup *ColorMode
-*DefaultColorMode: Monochrome
-*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color"
-*FoomaticRIPOptionSetting ColorMode=Color: "-c "
-*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome"
-*FoomaticRIPOptionSetting ColorMode=Monochrome: " "
-*CloseUI: *ColorMode
+*OpenUI *ColorModel/Color Mode: PickOne
+*FoomaticRIPOption ColorModel: enum CmdLine A
+*OrderDependency: 120 AnySetup *ColorModel
+*DefaultColorModel: RGB
+*ColorModel RGB/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color"
+*FoomaticRIPOptionSetting ColorModel=RGB: "-c "
+*ColorModel Gray/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome"
+*FoomaticRIPOptionSetting ColorModel=Gray: " "
+*CloseUI: *ColorModel
*OpenUI *PageSize/Page Size: PickOne
*FoomaticRIPOption PageSize: enum CmdLine A

4
pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch
View file

@ -1,5 +1,5 @@
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
--- a/src/shared/linux_osl.c 2015-09-19 01:47:15.000000000 +0300

4
pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch
View file

@ -2,12 +2,12 @@ Since Linux 4.7, the enum ieee80211_band is no longer used
This shall cause no problem's since both enums ieee80211_band
and nl80211_band were added in the same commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
Reference:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
--- a/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:57:36.159340297 -0500
+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2016-06-13 11:58:18.442323435 -0500

4
pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.11.patch
View file

@ -428,7 +428,7 @@ index 000000000000..1ed7032d4472
+solution, and details the disagreements and arguments. The latest
+version of this document can be found at the following URL.
+
+ https://git.kernel.org/cgit/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu
+ https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu
+
+This document was posted to the linux-kernel and cgroup mailing lists.
+Unfortunately, no consensus was reached as of Oct, 2016. The thread
@ -759,7 +759,7 @@ index 000000000000..1ed7032d4472
+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP
+ Peter Zijlstra <peterz@infradead.org>
+
+[5] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt
+[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt
+ Control Group v2
+ Tejun Heo <tj@kernel.org>
+

4
pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.9.patch
View file

@ -428,7 +428,7 @@ index 000000000000..1ed7032d4472
+solution, and details the disagreements and arguments. The latest
+version of this document can be found at the following URL.
+
+ https://git.kernel.org/cgit/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu
+ https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu
+
+This document was posted to the linux-kernel and cgroup mailing lists.
+Unfortunately, no consensus was reached as of Oct, 2016. The thread
@ -759,7 +759,7 @@ index 000000000000..1ed7032d4472
+ Re: [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP
+ Peter Zijlstra <peterz@infradead.org>
+
+[5] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt
+[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/cgroup-v2.txt
+ Control Group v2
+ Tejun Heo <tj@kernel.org>
+

2
pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
View file

@ -18,4 +18,4 @@ $ ver=4.7
$ git log --reverse --patch v$ver..remotes/tc-cgroup/cgroup-v2-cpu-v$ver > ../nixpkgs/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/$ver.patch
```
[1]: https://git.kernel.org/cgit/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu
[1]: https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git/tree/Documentation/cgroup-v2-cpu.txt?h=cgroup-v2-cpu

4
pkgs/servers/nosql/apache-jena/binary.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-jena";
version = "4.4.0";
version = "4.5.0";
src = fetchurl {
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
sha256 = "sha256-/+F7wKklFiJ3dTHd650IBSnAYOAx/ZLbk9ofoZF9E8k=";
sha256 = "sha256-/KHjhMNnqac2HG/yvHJa0MwdReX6XuexojaMgRFdaWo=";
};
buildInputs = [
makeWrapper

2
pkgs/tools/filesystems/f2fs-tools/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ ./f2fs-tools-cross-fix.patch ];
meta = with lib; {
homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/";
description = "Userland tools for the f2fs filesystem";
license = licenses.gpl2;
platforms = platforms.linux;

4
pkgs/tools/misc/goaccess/default.nix
View file

@ -10,14 +10,14 @@
}:
stdenv.mkDerivation rec {
version = "1.5.7";
version = "1.6";
pname = "goaccess";
src = fetchFromGitHub {
owner = "allinurl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ElDsQliB2+4X/psiavGr/bHQ1tMw7VMJroqCPMkOGOs=";
sha256 = "sha256-+42jTYYJyj+6ZRCfkgVwpyTS2lXdThlGHKD2iSoZkEI=";
};
nativeBuildInputs = [

4
pkgs/tools/networking/reaver-wps/default.nix
View file

@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpcap sqlite ];
# Workaround build failure on -fno-common toolchains:
# ld: crypto/dh_groups.o:src/crypto/../globule.h:141: multiple definition of
# `globule'; /build/ccrzO6vA.o:src/globule.h:141: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
setSourceRoot = ''
sourceRoot=$(echo */src)

72
pkgs/tools/security/crackmapexec/default.nix Normal file
View file

@ -0,0 +1,72 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "crackmapexec";
version = "5.2.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "byt3bl33d3r";
repo = "CrackMapExec";
rev = "v${version}";
hash = "sha256-IgD8RjwVEoEXmnHU3DR3wzUdJDWIbFw9sES5qYg30a8=";
};
nativeBuildInputs = with python3.pkgs; [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [
aioconsole
beautifulsoup4
dsinternals
impacket
lsassy
msgpack
neo4j
paramiko
pylnk3
pypsrp
pywerview
requests
requests_ntlm
termcolor
terminaltables
xmltodict
];
patches = [
# Switch to poetry-core, https://github.com/byt3bl33d3r/CrackMapExec/pull/580
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/byt3bl33d3r/CrackMapExec/commit/e5c6c2b5c7110035b34ea7a080defa6d42d21dd4.patch";
hash = "sha256-5SpoQD+uSYLM6Rdq0/NTbyEv4RsBUuawNNsknS71I9M=";
})
];
pythonRelaxDeps = true;
pythonRemoveDeps = [
"bs4"
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"cme"
];
meta = with lib; {
description = "Tool for pentesting networks";
homepage = "https://github.com/byt3bl33d3r/CrackMapExec";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
mainProgram = "cme";
};
}

2
pkgs/tools/security/efitools/default.nix
View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tools for manipulating UEFI secure boot platforms";
homepage = "https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git";
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git";
license = licenses.gpl2;
maintainers = [ maintainers.grahamc ];
platforms = platforms.linux;

2
pkgs/top-level/all-packages.nix
View file

@ -4988,6 +4988,8 @@ with pkgs;
cpufetch = callPackage ../tools/misc/cpufetch { };
crackmapexec = callPackage ../tools/security/crackmapexec { };
crackxls = callPackage ../tools/security/crackxls { };
crd2pulumi = callPackage ../development/tools/crd2pulumi { };

12
pkgs/top-level/python-packages.nix
View file

@ -5733,7 +5733,7 @@ in {
neo = callPackage ../development/python-modules/neo { };
neo4j-driver = callPackage ../development/python-modules/neo4j-driver { };
neo4j = callPackage ../development/python-modules/neo4j { };
nessclient = callPackage ../development/python-modules/nessclient { };
@ -6445,11 +6445,15 @@ in {
pencompy = callPackage ../development/python-modules/pencompy { };
phonopy = callPackage ../development/python-modules/phonopy { };
pixcat = callPackage ../development/python-modules/pixcat { };
psrpcore = callPackage ../development/python-modules/psrpcore { };
pyprecice = callPackage ../development/python-modules/pyprecice { };
phonopy = callPackage ../development/python-modules/phonopy { };
pypsrp = callPackage ../development/python-modules/pypsrp { };
phpserialize = callPackage ../development/python-modules/phpserialize { };
@ -8881,6 +8885,8 @@ in {
pywemo = callPackage ../development/python-modules/pywemo { };
pywerview = callPackage ../development/python-modules/pywerview { };
pywick = callPackage ../development/python-modules/pywick { };
pywilight = callPackage ../development/python-modules/pywilight { };
@ -9140,6 +9146,8 @@ in {
requests-cache = callPackage ../development/python-modules/requests-cache { };
requests-credssp = callPackage ../development/python-modules/requests-credssp { };
requests-hawk = callPackage ../development/python-modules/requests-hawk { };
requests = callPackage ../development/python-modules/requests { };