jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-24 06:05:30 +00:00 committed by GitHub
commit d8d6ba0d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 453 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maintainers/maintainer-list.nix
View File

@ -4401,6 +4401,12 @@
githubId = 5283991;
name = "Jake Waksbaum";
};
jakubgs = {
email = "jakub@gsokolowski.pl";
github = "jakubgs";
githubId = 2212681;
name = "Jakub Grzgorz Sokołowski";
};
jamiemagee = {
email = "jamie.magee@gmail.com";
github = "JamieMagee";
@ -6977,6 +6983,12 @@
githubId = 818502;
name = "Nathan Yong";
};
nbren12 = {
email = "nbren12@gmail.com";
github = "nbren12";
githubId = 1386642;
name = "Noah Brenowitz";
};
nckx = {
email = "github@tobias.gr";
github = "nckx";
@ -9420,8 +9432,8 @@
name = "Stian Lågstad";
};
StijnDW = {
email = "stekke@airmail.cc";
github = "StijnDW";
email = "nixdev@rinsa.eu";
github = "Stekke";
githubId = 1751956;
name = "Stijn DW";
};

1
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
View File

@ -10,6 +10,7 @@ with lib;
system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
inherit lib config pkgs;
diskSize = 8192;
format = "qcow2";
configFile = pkgs.writeText "configuration.nix"
''

5
nixos/maintainers/scripts/ec2/amazon-image.nix
View File

@ -40,9 +40,8 @@ in {
};
sizeMB = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 8192;
type = types.int;
default = if config.ec2.hvm then 2048 else 8192;
description = "The size in MB of the image";
};

2
nixos/maintainers/scripts/openstack/openstack-image.nix
View File

@ -12,8 +12,8 @@ with lib;
system.build.openstackImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
additionalSpace = "1024M";
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
diskSize = 8192;
format = "qcow2";
configFile = pkgs.writeText "configuration.nix"
''

2
nixos/modules/hardware/printers.nix
View File

@ -15,7 +15,7 @@ let
${ppdOptionsString p.ppdOptions}
'';
ensureDefaultPrinter = name: ''
${pkgs.cups}/bin/lpoptions -d '${name}'
${pkgs.cups}/bin/lpadmin -d '${name}'
'';
# "graph but not # or /" can't be implemented as regex alone due to missing lookahead support

5
nixos/modules/virtualisation/azure-image.nix
View File

@ -9,9 +9,8 @@ in
options = {
virtualisation.azureImage.diskSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 2048;
type = with types; int;
default = 2048;
description = ''
Size of disk image. Unit is MB.
'';

5
nixos/modules/virtualisation/digital-ocean-image.nix
View File

@ -10,9 +10,8 @@ in
options = {
virtualisation.digitalOceanImage.diskSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 4096;
type = with types; int;
default = 4096;
description = ''
Size of disk image. Unit is MB.
'';

5
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -18,9 +18,8 @@ in
options = {
virtualisation.googleComputeImage.diskSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 1536;
type = with types; int;
default = 1536;
description = ''
Size of disk image. Unit is MB.
'';

5
nixos/modules/virtualisation/hyperv-image.nix
View File

@ -9,9 +9,8 @@ in {
options = {
hyperv = {
baseImageSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 2048;
type = types.int;
default = 2048;
description = ''
The size of the hyper-v base image in MiB.
'';

5
nixos/modules/virtualisation/virtualbox-image.nix
View File

@ -11,9 +11,8 @@ in {
options = {
virtualbox = {
baseImageSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 50 * 1024;
type = types.int;
default = 50 * 1024;
description = ''
The size of the VirtualBox base image in MiB.
'';

5
nixos/modules/virtualisation/vmware-image.nix
View File

@ -18,9 +18,8 @@ in {
options = {
vmware = {
baseImageSize = mkOption {
type = with types; either (enum [ "auto" ]) int;
default = "auto";
example = 2048;
type = types.int;
default = 2048;
description = ''
The size of the VMWare base image in MiB.
'';

6
pkgs/applications/audio/fdkaac/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fdkaac";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "nu774";
repo = pname;
rev = "v${version}";
sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6";
sha256 = "tHhICq/FzbkvWkDdNzGqGoo7nIDb+DJXmkFwtPIA89c=";
};
nativeBuildInputs = [ autoreconfHook ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
description = "Command line encoder frontend for libfdk-aac encder";
description = "Command line encoder frontend for libfdk-aac encoder";
longDescription = ''
fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format,
and encodes it into either M4A / AAC file.

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.24";
version = "0.29.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7wfBKXO4uUrFjEklmgfgzIECARsOolwXjNFOFqfn1ds=";
sha256 = "sha256-Ubft+R2nBUNRx3SfksORxBbKY/mSvY+tKkz1UcGXyjw=";
};
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";

14
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -1,23 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub }:
# Currently `buildGo114Module` is passed as `buildGoModule` from
# `../default.nix`. Please remove the fixed 1.14 once a new release has been
# made and the issue linked below has been closed upstream.
# https://github.com/Arkweid/lefthook/issues/151
buildGoModule rec {
pname = "lefthook";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "Arkweid";
owner = "evilmartians";
repo = "lefthook";
sha256 = "1ciyxjx3r3dcl8xas49kqsjshs1bv4pafmfmhdfyfdvlaj374hgj";
sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk=";
};
vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8";
vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";
doCheck = false;

2
pkgs/development/coq-modules/QuickChick/default.nix
View File

@ -5,6 +5,7 @@ mkCoqDerivation {
pname = "QuickChick";
owner = "QuickChick";
defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
{ cases = [ "8.10" pred.true ]; out = "1.2.1"; }
@ -14,6 +15,7 @@ mkCoqDerivation {
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
] null;
release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
release."1.2.1".sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46";

4
pkgs/development/libraries/alembic/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "alembic";
version = "1.7.16";
version = "1.8.0";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = version;
sha256 = "1vmhwjhppjv8m0ysk2qz0wl47cbl8i40bjjq5l4jmmp1ysvlbknf";
sha256 = "sha256-c4SN3kNY8415+O/2AYuHNQFEmuTBtLaWj5fsj0yJ2vs=";
};
outputs = [ "bin" "dev" "out" "lib" ];

4
pkgs/development/libraries/jasper/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "jasper";
version = "2.0.28";
version = "2.0.32";
src = fetchFromGitHub {
owner = "jasper-software";
repo = pname;
rev = "version-${version}";
hash = "sha256-f3UG5w8GbwZcsFBaQN6v8kdEkKIGgizcAgaVZtKwS78=";
hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libnbd/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
version = "1.7.5";
version = "1.7.7";
src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
sha256 = "sha256-UxQx/wnKnCB3uC9xEfq1F0l3kHAJjp9GzbeRugKyFsk=";
hash = "sha256-fNeu1qx+EbKitv2I8nJAmGMF5jxN2RZGPR/LJYnOjG8=";
};
nativeBuildInputs = [

9
pkgs/development/libraries/rapidjson/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake }:
stdenv.mkDerivation rec {
pname = "rapidjson";
@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
};
patches = [
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch";
sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82";
})
];
nativeBuildInputs = [ pkg-config cmake ];
preConfigure = ''

61
pkgs/development/mobile/gomobile/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, lib, fetchgit, buildGoModule, zlib, makeWrapper, xcodeenv, androidenv
, xcodeWrapperArgs ? { }
, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs
, androidPkgs ? androidenv.composeAndroidPackages {
includeNDK = true;
ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken.
} }:
buildGoModule {
pname = "gomobile";
version = "unstable-2020-06-22";
vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94";
src = fetchgit {
# WARNING: Next commit removes support for ARM 32 bit builds for iOS
rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5";
name = "gomobile";
url = "https://go.googlesource.com/mobile";
sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm";
};
subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ];
# Fails with: go: cannot find GOROOT directory
doCheck = false;
patches = [ ./resolve-nix-android-sdk.patch ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals stdenv.isDarwin [ xcodeWrapper ];
# Prevent a non-deterministic temporary directory from polluting the resulting object files
postPatch = ''
substituteInPlace cmd/gomobile/env.go --replace \
'tmpdir, err = ioutil.TempDir("", "gomobile-work-")' \
'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' \
--replace '"io/ioutil"' ""
substituteInPlace cmd/gomobile/init.go --replace \
'tmpdir, err = ioutil.TempDir(gomobilepath, "work-")' \
'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "work")'
'';
# Necessary for GOPATH when using gomobile.
postInstall = ''
mkdir -p $out/src/golang.org/x
ln -s $src $out/src/golang.org/x/mobile
wrapProgram $out/bin/gomobile \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
--prefix PATH : "${androidPkgs.androidsdk}/bin" \
--set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \
--set GOPATH $out
'';
meta = with lib; {
description = "A tool for building and running mobile apps written in Go";
homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile";
license = licenses.bsd3;
maintainers = with maintainers; [ jakubgs ];
};
}

15
pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go
index 3b01adc..76216fa 100644
--- a/cmd/gomobile/bind_androidapp.go
+++ b/cmd/gomobile/bind_androidapp.go
@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) {
var apiVer int
for _, fi := range fis {
name := fi.Name()
+ // Resolve symlinked directories (this is how the Nix Android SDK package is built)
+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil {
+ fi = fi2
+ }
if !fi.IsDir() || !strings.HasPrefix(name, "android-") {
continue
}

3
pkgs/development/node-packages/default.nix
View File

@ -285,6 +285,9 @@ let
libsecret
self.node-gyp-build
self.node-pre-gyp
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
];
};

11
pkgs/development/python-modules/bitarray/default.nix
View File

@ -1,14 +1,19 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib, buildPythonPackage, fetchPypi, python }:
buildPythonPackage rec {
pname = "bitarray";
version = "1.8.1";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "e02f79fba7a470d438eb39017d503498faaf760b17b6b46af1a9de12fd58d311";
sha256 = "sha256-7DpPbXEaee0jrqlUFjjTNT3D8IPyk6ExgLFLSC4+Ge8=";
};
checkPhase = ''
cd $out
${python.interpreter} -c 'import bitarray; bitarray.test()'
'';
pythonImportsCheck = [ "bitarray" ];
meta = with lib; {

2
pkgs/development/python-modules/dask-glm/default.nix
View File

@ -9,6 +9,7 @@
, scipy
, scikitlearn
, pytest
, setuptools-scm
}:
buildPythonPackage rec {
@ -22,6 +23,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
checkInputs = [ pytest ];
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];
checkPhase = ''

2
pkgs/development/python-modules/dask-ml/default.nix
View File

@ -13,6 +13,7 @@
, multipledispatch
, packaging
, distributed
, setuptools-scm
}:
buildPythonPackage rec {
@ -38,6 +39,7 @@ buildPythonPackage rec {
scipy
six
toolz
setuptools-scm
];
# has non-standard build from source, and pypi doesn't include tests

18
pkgs/development/python-modules/dask/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, bokeh
, buildPythonPackage
, fetchpatch
, fetchFromGitHub
, fsspec
, pytestCheckHook
@ -42,7 +43,7 @@ buildPythonPackage rec {
distributed
];
doCheck = false;
doCheck = true;
checkInputs = [
pytestCheckHook
@ -52,6 +53,16 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
patches = [
# dask dataframe cannot be imported in sandboxed builds
# See https://github.com/dask/dask/pull/7601
(fetchpatch {
url = "https://github.com/dask/dask/commit/9ce5b0d258cecb3ef38fd844135ad1f7ac3cea5f.patch";
sha256 = "sha256-1EVRYwAdTSEEH9jp+UOnrijzezZN3iYR6q6ieYJM3kY=";
name = "fix-dask-dataframe-imports-in-sandbox.patch";
})
];
postPatch = ''
# versioneer hack to set version of github package
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
@ -66,8 +77,13 @@ buildPythonPackage rec {
disabledTests = [
"test_annotation_pack_unpack"
"test_annotations_blockwise_unpack"
# this test requires features of python3Packages.psutil that are
# blocked in sandboxed-builds
"test_auto_blocksize_csv"
];
pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ];
meta = with lib; {
description = "Minimal task scheduling abstraction";
homepage = "https://dask.org/";

24
pkgs/development/python-modules/fsspec/default.nix
View File

@ -5,34 +5,36 @@
, pytestCheckHook
, numpy
, stdenv
, aiohttp
, pytest-vcr
, requests
}:
buildPythonPackage rec {
pname = "fsspec";
version = "0.8.3";
version = "2021.04.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "intake";
repo = "filesystem_spec";
rev = version;
sha256 = "0mfy0wxjfwwnp5q2afhhfbampf0fk71wsv512pi9yvrkzzfi1hga";
sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k=";
};
checkInputs = [
pytestCheckHook
numpy
];
checkInputs = [ pytestCheckHook numpy pytest-vcr ];
__darwinAllowLocalNetworking = true;
propagatedBuildInputs = [ aiohttp requests ];
disabledTests = [
# Test assumes user name is part of $HOME
# AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar'
"test_strip_protocol_expanduser"
# flaky: works locally but fails on hydra
# as it uses the install dir for tests instead of a temp dir
# resolved in https://github.com/intake/filesystem_spec/issues/432 and
# can be enabled again from version 0.8.4
"test_pathobject"
# test accesses this remote ftp server:
# https://ftp.fau.de/debian-cd/current/amd64/log/success
"test_find"
] ++ lib.optionals (stdenv.isDarwin) [
# works locally on APFS, fails on hydra with AssertionError comparing timestamps
# darwin hydra builder uses HFS+ and has only one second timestamp resolution

37
pkgs/development/python-modules/gcsfs/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth
, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod
, pytest-vcr, vcrpy }:
buildPythonPackage rec {
pname = "gcsfs";
version = "2021.04.0";
# github sources needed for test data
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs=";
};
propagatedBuildInputs = [
google-auth
google-auth-oauthlib
requests
decorator
fsspec
aiohttp
ujson
crcmod
];
checkInputs = [ pytestCheckHook pytest-vcr vcrpy ];
pythonImportsCheck = [ "gcsfs" ];
meta = with lib; {
description = "Convenient Filesystem interface over GCS";
homepage = "https://github.com/dask/gcsfs";
license = licenses.bsd3;
maintainers = [ maintainers.nbren12 ];
};
}

27
pkgs/development/python-modules/nclib/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "nclib";
version = "1.0.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "0kf8x30lrwhijab586i54g70s3sxvm2945al48zj27grj0pagh7g";
};
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "nclib" ];
meta = with lib; {
description = "Python module that provides netcat features";
homepage = "https://nclib.readthedocs.io/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

25
pkgs/development/python-modules/sphinx-serve/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "sphinx-serve";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "8d90f6595114108500b1f935d3f4d07bf5192783c67ce83f944ef289099669c9";
};
doCheck = false; # No tests
pythonImportsCheck = [ "sphinx_serve" ];
meta = with lib; {
description = "Spawns a simple HTTP server to preview your sphinx documents";
homepage = "https://github.com/tlatsas/sphinx-serve";
maintainers = with maintainers; [ FlorianFranzen ];
license = licenses.mit;
};
}

21
pkgs/development/python-modules/watchdog/default.nix
View File

@ -2,32 +2,22 @@
, stdenv
, buildPythonPackage
, fetchPypi
, fetchpatch
, argh
, pathtools
, pyyaml
, pytest-cov
, pytestCheckHook
, CoreServices
}:
buildPythonPackage rec {
pname = "watchdog";
version = "2.0.2";
version = "2.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Uy/t2ZPnVVRnH6o2zQTFgM7T+uCEJUp3mvu9iq8AVms=";
sha256 = "sha256-QojTqYQyTbSS5XqhaWZiOKJXjwr1oIFoVSZgj7n2vWE=";
};
patches = [
(fetchpatch {
# Fix test flakiness on Apple Silicon, remove after upgrade to 2.0.6.
url = "https://github.com/gorakhargosh/watchdog/commit/331fd7c2c819663be39bc146e78ce67553f265fa.patch";
sha256 = "sha256-pLkZmbPN3qRNHs53OP0HIyDxqYCPPo6yOcBLD3aO2YE=";
})
];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
propagatedBuildInputs = [
@ -37,10 +27,15 @@ buildPythonPackage rec {
];
checkInputs = [
pytest-cov
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov=watchdog" "" \
--replace "--cov-report=term-missing" ""
'';
pythonImportsCheck = [ "watchdog" ];
meta = with lib; {

9
pkgs/development/tools/parsing/antlr/3.5.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, fetchFromGitHub, jre}:
{lib, stdenv, fetchpatch, fetchurl, fetchFromGitHub, jre}:
stdenv.mkDerivation rec {
pname = "antlr";
@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk";
};
patches = [
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/antlr3/raw/f1bb8d639678047935e1761c3bf3c1c7da8d0f1d/f/0006-antlr3memory.hpp-fix-for-C-20-mode.patch";
sha256 = "0apk904afjqbad6c7z9r72a9lkbz69vwrl8j2a6zgxjn8dfb2p8b";
})
];
installPhase = ''
mkdir -p "$out"/{lib/antlr,bin,include}
cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar"

9
pkgs/development/tools/tabnine/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, lib, fetchurl, unzip }:
let
version = "3.3.101";
version = "3.3.115";
src =
if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl
{
url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
sha256 = "KrFDQSs7hMCioeqPKTNODe3RKnwNV8XafdYDUaxou/Y=";
sha256 = "104h3b9cvmz2m27a94cfc00xm8wa2p1pvrfs92hrz59hcs8vdldf";
}
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl
{
url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
sha256 = "vbeuZf/phOj83xTha+AzpKIvvrjwMar7q2teAmr5ESQ=";
sha256 = "0rs2vmdz8c9zs53pjbzy27ir0p5v752cpsnqfaqf0ilx7k6fpnnm";
}
else throw "Not supported on ${stdenv.hostPlatform.system}";
in
@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
installPhase = ''
install -Dm755 TabNine $out/bin/TabNine
install -Dm755 TabNine-deep-cloud $out/bin/TabNine-deep-cloud
install -Dm755 TabNine-deep-local $out/bin/TabNine-deep-local
install -Dm755 WD-TabNine $out/bin/WD-TabNine
'';
meta = with lib; {

32
pkgs/development/tools/zls/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, lib, fetchFromGitHub, zig }:
stdenv.mkDerivation rec {
pname = "zls";
version = "0.1.0";
src = fetchFromGitHub {
owner = "zigtools";
repo = pname;
rev = version;
sha256 = "sha256-A4aOdmlIxBUeKyczzLxH4y1Rl9TgE1EeiKGbWY4p/00=";
fetchSubmodules = true;
};
nativeBuildInputs = [ zig ];
preBuild = ''
export HOME=$TMPDIR
'';
installPhase = ''
zig build -Drelease-safe --prefix $out install
'';
meta = with lib; {
description = "Zig LSP implementation + Zig Language Server";
changelog = "https://github.com/zigtools/zls/releases/tag/${version}";
homepage = "https://github.com/zigtools/zls";
license = [ licenses.mit ];
maintainers = with maintainers; [ fortuneteller2k ];
};
}

43
pkgs/misc/drivers/infnoise/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib, stdenv, fetchFromGitHub, libftdi }:
stdenv.mkDerivation rec {
pname = "infnoise";
version = "unstable-2019-08-12";
src = fetchFromGitHub {
owner = "13-37-org";
repo = "infnoise";
rev = "132683d4b5ce0902468b666cba63baea36e97f0c";
sha256 = "1dzfzinyvhyy9zj32kqkl19fyhih6sy8r5sa3qahbbr4c30k7flp";
};
# Patch makefile so we can set defines from the command line instead of it depending on .git
patches = [ ./makefile.patch ];
GIT_COMMIT = src.rev;
GIT_VERSION = version;
GIT_DATE = "2019-08-12";
buildInputs = [ libftdi ];
sourceRoot = "source/software";
makefile = "Makefile.linux";
makeFlags = [ "PREFIX=$(out)" ];
postPatch = ''
substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out"
'';
meta = with lib; {
homepage = "https://github.com/13-37-org/infnoise";
description = "Driver for the Infinite Noise TRNG";
longDescription = ''
The Infinite Noise TRNG is a USB key hardware true random number generator.
It can either provide rng for userland applications, or provide rng for the OS entropy.
Add the following to your system configuration for plug and play support, adding to the OS entropy:
systemd.packages = [ pkgs.infnoise ];
services.udev.packages = [ pkgs.infnoise ];
'';
license = licenses.cc0;
maintainers = with maintainers; [ StijnDW ];
platforms = platforms.linux;
};
}

14
pkgs/misc/drivers/infnoise/makefile.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/software/Makefile.linux b/software/Makefile.linux
index db48aa5..df8b3d2 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,6 +1,6 @@
-GIT_VERSION := $(shell git --no-pager describe --tags --always)
-GIT_COMMIT := $(shell git rev-parse --verify HEAD)
-GIT_DATE := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
+GIT_VERSION ?= $(shell git --no-pager describe --tags --always)
+GIT_COMMIT ?= $(shell git rev-parse --verify HEAD)
+GIT_DATE ?= $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only))
PREFIX = $(DESTDIR)/usr/local

14
pkgs/tools/audio/spotdl/default.nix
View File

@ -1,30 +1,20 @@
{ lib
, python3
, fetchFromGitHub
, fetchpatch
, ffmpeg
}:
python3.pkgs.buildPythonApplication rec {
pname = "spotdl";
version = "3.5.1";
version = "3.5.2";
src = fetchFromGitHub {
owner = "spotDL";
repo = "spotify-downloader";
rev = "v${version}";
sha256 = "sha256-Mc0aODyt0rwmBhkvY/gH1ODz4k8LOxyU5xXglSb6sPs=";
sha256 = "sha256-V9jIA+ULjZRj+uVy4Yh55PapPiqFy9I9ZVln1nt/bJw=";
};
patches = [
# https://github.com/spotDL/spotify-downloader/pull/1254
(fetchpatch {
name = "subprocess-dont-use-shell.patch";
url = "https://github.com/spotDL/spotify-downloader/commit/fe9848518900577776b463ef0798796201e226ac.patch";
sha256 = "1kqq3y31dcx1zglywr564hkd2px3qx6sk3rkg7yz8n5hnfjhp6fn";
})
];
propagatedBuildInputs = with python3.pkgs; [
spotipy
pytube

6
pkgs/tools/backup/bupstash/default.nix
View File

@ -1,16 +1,16 @@
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
rustPlatform.buildRustPackage rec {
pname = "bupstash";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "andrewchambers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zZHJlC0OICIc3G825t7GrZwdmkaaLQKzX2IwkKigkV4=";
sha256 = "sha256-uA5XEG9nvqsXg34bqw8k4Rjk5F9bPFSk1HQ4Bv6Ar+I=";
};
cargoSha256 = "sha256-KVeIF6x+gpb8vkqCtZptF5EX9G1Zv6q8L6tskN6HziM=";
cargoSha256 = "sha256-4r+Ioh6Waoy/7LVF3CPz18c2bCRYym5T4za1GSKw7WQ=";
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
buildInputs = [ libsodium ];

8
pkgs/tools/misc/ffsend/default.nix
View File

@ -16,16 +16,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
version = "0.2.68";
version = "0.2.71";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "0ga1v4s8ks2v632mim8ljya0gi2j8bbwj98yfm3g00p0z1i526qk";
sha256 = "sha256-dXFnM8085XVzUwk1e3SoO+O+z9lJ40htJzHBGRQ95XY=";
};
cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w";
cargoSha256 = "sha256-VwxIH/n1DjZsMOLAREclqanb4q7QEOZ35KWWciyrnyQ=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs =
@ -54,7 +54,7 @@ buildRustPackage rec {
web browser.
'';
homepage = "https://gitlab.com/timvisee/ffsend";
license = licenses.gpl3;
license = licenses.gpl3Only;
maintainers = with maintainers; [ lilyball equirosa ];
platforms = platforms.unix;
};

9
pkgs/tools/security/ghidra/default.nix
View File

@ -23,14 +23,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "ghidra";
version = "9.2.2";
versiondate = "20201229";
version = "9.2.3";
versiondate = "20210325";
src = fetchzip {
url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
sha256 = "1xahkwiqdcwxssah16hhgrmyam49cb341xp5ysycj1h0kkm8p53s";
sha256 = "sha256-/rQ3JeOR/D+HxzkJ+nV+pd/7V81+tCyTOndwpXI05hg=";
};
nativeBuildInputs = [
@ -72,7 +71,7 @@ in stdenv.mkDerivation rec {
homepage = "https://ghidra-sre.org/";
platforms = [ "x86_64-linux" "x86_64-darwin" ];
license = licenses.asl20;
maintainers = with maintainers; [ ck3d govanify ];
maintainers = with maintainers; [ ck3d govanify mic92 ];
};
}

2
pkgs/tools/security/metasploit/Gemfile
View File

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

18
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: fb842915658f23b8997aa2cab4c3a62f3170cbbd
ref: refs/tags/6.0.40
revision: 451fe6ffdb90fffe3df6b788e6410217a511a3f4
ref: refs/tags/6.0.41
specs:
metasploit-framework (6.0.40)
metasploit-framework (6.0.41)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -123,7 +123,7 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.445.0)
aws-partitions (1.446.0)
aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@ -146,7 +146,7 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
bindata (2.4.8)
bindata (2.4.9)
bson (4.12.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
@ -168,11 +168,15 @@ GEM
eventmachine (1.2.7)
faker (2.17.0)
i18n (>= 1.6, < 2)
faraday (1.3.0)
faraday (1.4.1)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ruby2_keywords (>= 0.0.4)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faye-websocket (0.11.0)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)

4
pkgs/tools/security/metasploit/default.nix
View File

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.40";
version = "6.0.41";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-QEaTHGCgBl1Lh6zZO1OSY3kS+6+xOr1lbHPNeS1DZZ8=";
sha256 = "sha256-6oaTc3UQayZ/ThurwFXdI1prwriz/XVS9zoeD427mj8=";
};
nativeBuildInputs = [ makeWrapper ];

38
pkgs/tools/security/metasploit/gemset.nix
View File

@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yvjc0vpcycr5plvkh63cjpivqi0slzq6sj60jllz8p99kli4xrj";
sha256 = "1n7cr44r7fvmc3rpk5kwwsz34ym2cmih76ij5xh2w1mmfyh3bgry";
type = "gem";
};
version = "1.445.0";
version = "1.446.0";
};
aws-sdk-core = {
groups = ["default"];
@ -204,10 +204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
sha256 = "16z30ca74h1mr452jnj1csv6yfnmdxsz0m1xpjf3svwybrx25rng";
type = "gem";
};
version = "2.4.8";
version = "2.4.9";
};
bson = {
groups = ["default"];
@ -344,10 +344,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi";
type = "gem";
};
version = "1.3.0";
version = "1.4.1";
};
faraday-excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
type = "gem";
};
version = "1.1.0";
};
faraday-net_http = {
groups = ["default"];
@ -359,6 +369,16 @@
};
version = "1.0.1";
};
faraday-net_http_persistent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka";
type = "gem";
};
version = "1.1.0";
};
faye-websocket = {
groups = ["default"];
platforms = [];
@ -514,12 +534,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "fb842915658f23b8997aa2cab4c3a62f3170cbbd";
sha256 = "17v58cnpkkbkdijvsfmimzxi4yb3j99kpndchx5ms1m0c0f96ij0";
rev = "451fe6ffdb90fffe3df6b788e6410217a511a3f4";
sha256 = "0gwspf6hy7isyx97bzdkp316nni3vmaw1aqv9rzjcsqhfmrr71pa";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.40";
version = "6.0.41";
};
metasploit-model = {
groups = ["default"];

19
pkgs/top-level/all-packages.nix
View File

@ -1567,6 +1567,10 @@ in
xcodeenv = callPackage ../development/mobile/xcodeenv { };
gomobile = callPackage ../development/mobile/gomobile {
buildGoModule = buildGo115Module;
};
ssh-agents = callPackage ../tools/networking/ssh-agents { };
ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { };
@ -5951,11 +5955,7 @@ in
lbreakout2 = callPackage ../games/lbreakout2 { };
lefthook = callPackage ../applications/version-management/git-and-tools/lefthook {
# Please use empty attrset once upstream bugs have been fixed
# https://github.com/Arkweid/lefthook/issues/151
buildGoModule = buildGo114Module;
};
lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { };
lego = callPackage ../tools/admin/lego { };
@ -13702,6 +13702,8 @@ in
ytt = callPackage ../development/tools/ytt {};
zls = callPackage ../development/tools/zls { };
zydis = callPackage ../development/libraries/zydis { };
winpdb = callPackage ../development/tools/winpdb { };
@ -17523,6 +17525,10 @@ in
fftw = fftwFloat;
};
sphinx = with python3Packages; toPythonApplication sphinx;
sphinx-serve = with python3Packages; toPythonApplication sphinx-serve;
sphinxbase = callPackage ../development/libraries/sphinxbase { };
sphinxsearch = callPackage ../servers/search/sphinxsearch { };
@ -28954,6 +28960,7 @@ in
osi = callPackage ../development/libraries/science/math/osi { };
or-tools = callPackage ../development/libraries/science/math/or-tools {
python = python3;
abseil-cpp = abseil-cpp.override { static = true; };
};
@ -29866,6 +29873,8 @@ in
image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
infnoise = callPackage ../misc/drivers/infnoise { };
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };

6
pkgs/top-level/python-packages.nix
View File

@ -2584,6 +2584,8 @@ in {
gcovr = callPackage ../development/python-modules/gcovr { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; });
gdata = callPackage ../development/python-modules/gdata { };
@ -4363,6 +4365,8 @@ in {
ncclient = callPackage ../development/python-modules/ncclient { };
nclib = callPackage ../development/python-modules/nclib { };
ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { };
ndjson = callPackage ../development/python-modules/ndjson { };
@ -7607,6 +7611,8 @@ in {
sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
sphinx-serve = callPackage ../development/python-modules/sphinx-serve { };
sphinx-testing = callPackage ../development/python-modules/sphinx-testing { };
spidev = callPackage ../development/python-modules/spidev { };