nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-11 18:01:59 +00:00 committed by GitHub
commit babb761ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 814 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -20,6 +20,12 @@
PHP now defaults to PHP 8.0, updated from 7.4.
</para>
</listitem>
<listitem>
<para>
kOps now defaults to 1.21.0, which uses containerd as the
default runtime.
</para>
</listitem>
<listitem>
<para>
<literal>python3</literal> now defaults to Python 3.9, updated

1
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -7,6 +7,7 @@ In addition to numerous new and upgraded packages, this release has the followin
## Highlights {#sec-release-21.11-highlights}
- PHP now defaults to PHP 8.0, updated from 7.4.
- kOps now defaults to 1.21.0, which uses containerd as the default runtime.
- `python3` now defaults to Python 3.9, updated from Python 3.8.

1
nixos/modules/installer/tools/nixos-option/default.nix Normal file
View File

@ -0,0 +1 @@
{ pkgs, ... }: pkgs.nixos-option

12
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -323,15 +323,13 @@ let
HTTP username
'';
};
password = mkOption {
type = types.str;
description = ''
HTTP password
'';
};
password = mkOpt types.str "HTTP password";
password_file = mkOpt types.str "HTTP password file";
};
}) ''
Optional http login credentials for metrics scraping.
Sets the `Authorization` header on every scrape request with the
configured username and password.
password and password_file are mutually exclusive.
'';
bearer_token = mkOpt types.str ''

4
pkgs/applications/blockchains/charge-lnd/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.1.3";
version = "0.2.1";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y";
sha256 = "0l4h3fdvln03ycbg3xngh8vkhgrz4ad864yyn4gmdjp0ypi69qa1";
};
propagatedBuildInputs = with python3Packages; [

1
pkgs/applications/editors/neovim/default.nix
View File

@ -131,6 +131,7 @@ in
- Improve extensibility with a new plugin architecture
'';
homepage = "https://www.neovim.io";
mainProgram = "nvim";
# "Contributions committed before b17d96 by authors who did not sign the
# Contributor License Agreement (CLA) remain under the Vim license.
# Contributions committed after b17d96 are licensed under Apache 2.0 unless

1
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -131,7 +131,6 @@ let
hydraPlatforms = [];
# prefer wrapper over the package
priority = (neovim.meta.priority or 0) - 1;
mainProgram = "nvim";
};
};
in

5
pkgs/applications/misc/cobalt/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "cobalt";
@ -13,10 +13,13 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
description = "Static site generator written in Rust";
homepage = "https://github.com/cobalt-org/cobalt.rs/";
license = licenses.mit;
maintainers = with maintainers; [ ethancedwards8 ];
platforms = platforms.unix;
};
}

7
pkgs/applications/misc/neo4j-desktop/default.nix
View File

@ -1,21 +1,22 @@
{ appimageTools, lib, fetchurl }:
let
pname = "neo4j-desktop";
version = "1.4.5";
version = "1.4.7";
name = "${pname}-${version}";
src = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage";
sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo";
hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc=";
};
appimageContents = appimageTools.extract { inherit src; name = pname; };
appimageContents = appimageTools.extract { inherit name src; };
in appimageTools.wrapType2 {
inherit name src;
extraPkgs = pkgs: with pkgs; [ libsecret ];
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'

7
pkgs/applications/misc/slides/default.nix
View File

@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby, sd }:
{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }:
buildGoModule rec {
pname = "slides";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "maaslalani";
repo = "slides";
rev = "v${version}";
sha256 = "15f4sn1zsqqhzxnmwb1igh8xhka6li31ygdqgbjvxzm93lkarxvs";
sha256 = "1cywqrqj199hmx532h4vn0j17ypswq2zkmv8qpxpayvjwimx4pwk";
};
checkInputs = [
@ -16,7 +16,6 @@ buildGoModule rec {
go
python3
ruby
sd
];
vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f";

11
pkgs/applications/networking/cluster/kops/default.nix
View File

@ -53,11 +53,6 @@ rec {
mkKops = generic;
kops_1_18 = mkKops {
version = "1.18.2";
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
};
kops_1_19 = mkKops rec {
version = "1.19.2";
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
@ -69,4 +64,10 @@ rec {
sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557";
rev = "v${version}";
};
kops_1_21 = mkKops rec {
version = "1.21.0";
sha256 = "sha256-T2i3qpg3GC7yaYCGrN1V5XXrUyT+Ce9Q4aV00gQJ7gM=";
rev = "v${version}";
};
}

6
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -567,10 +567,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
"repo": "terraform-provider-kubernetes-alpha",
"rev": "v0.3.3",
"sha256": "18i9yp0w6mmic95p6d6ah1hl3rmgkh264z1a05973yslpqhyx9yl",
"rev": "v0.5.0",
"sha256": "0yqm3wlya69w9g9kzgvm28mbbwp6wik51syjnbnj8dis5kspx8gd",
"vendorSha256": null,
"version": "0.3.3"
"version": "0.5.0"
},
"launchdarkly": {
"owner": "terraform-providers",

2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -41,6 +41,7 @@
, pango
, runtimeShell
, writeScript
, xdg-utils
, xidel
}:
@ -164,6 +165,7 @@ stdenv.mkDerivation {
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1 \
--prefix PATH : "${lib.getBin gnupg}/bin" \
--prefix PATH : "${lib.getBin xdg-utils}/bin" \
--prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
'';

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -50,6 +50,7 @@
, unzip
, which
, writeScript
, xdg-utils
, xidel
, xorg
, yasm
@ -311,6 +312,7 @@ stdenv.mkDerivation rec {
--set MOZ_LEGACY_PROFILES 1
--set MOZ_ALLOW_DOWNGRADE 1
--prefix PATH : "${lib.getBin gnupg}/bin"
--prefix PATH : "${lib.getBin xdg-utils}/bin"
--prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib"
)
'';

4
pkgs/applications/science/misc/snakemake/default.nix
View File

@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "6.5.0";
version = "6.5.3";
propagatedBuildInputs = with python3Packages; [
appdirs
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "b166ec74537e02553fcaf0ddcffc32dfdb9dcaa1260af297a56eded6a179b2ee";
sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json

6
pkgs/applications/version-management/git-and-tools/gitui/default.nix
View File

@ -1,16 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
rustPlatform.buildRustPackage rec {
pname = "gitui";
version = "0.16.1";
version = "0.16.2";
src = fetchFromGitHub {
owner = "extrawurst";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8RPIPimDImLUR9oHVZZ7ZeKLtIhebv/d0kl4CQ5NFdU=";
sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo=";
};
cargoSha256 = "sha256-1IHbOjZV8Rc0el7J983B8pvnbt8+QtYiknZU/I85OnY=";
cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4=";
nativeBuildInputs = [ python3 perl ];
buildInputs = [ openssl ]

4
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -22,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "5.0.0";
version = "5.0.3";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "07n9p93iyrzb7636qqwknq8dd3im1y6wb9jfvif96mbvvdwsnfyz";
sha256 = "sha256-Ah1Rp/o4LPdYm+wj2W5ljjMkCI3PgoAHrlM8yEQP77o=";
};
outputs = [ "out" "dev" ];

31
pkgs/development/compilers/fennel/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }:
stdenv.mkDerivation rec {
pname = "fennel";
version = "0.9.2";
src = fetchFromSourcehut {
owner = "~technomancy";
repo = pname;
rev = version;
sha256 = "1kpm3lzxzwkhxm4ghpbx8iw0ni7gb73y68lsc3ll2rcx0fwv9303";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ lua ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
installManPage fennel.1
'';
meta = with lib; {
description = "A Lua Lisp language";
homepage = "https://fennel-lang.org/";
license = licenses.mit;
platforms = lua.meta.platforms;
maintainers = [ maintainers.maaslalani ];
};
}

12
pkgs/development/interpreters/spidermonkey/68.nix
View File

@ -14,6 +14,15 @@ in stdenv.mkDerivation rec {
sha256 = "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f";
};
patches = [
# Backport a change from Firefox 75 that fixes finding the
# location of clang and libclang.
(fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da";
sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0";
})
];
outputs = [ "out" "dev" ];
setOutputFlags = false; # Configure script only understands --includedir
@ -55,9 +64,6 @@ in stdenv.mkDerivation rec {
"--with-system-zlib"
"--with-system-icu"
"--with-libclang-path=${llvmPackages.libclang.lib}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
"--enable-shared-js"
"--enable-readline"
# Fedora and Arch disable optimize, but it doesn't seme to be necessary

38
pkgs/development/libraries/oracle-instantclient/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, autoPatchelfHook
, fixDarwinDylibNames
@ -17,7 +18,7 @@ let
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
# assemble list of components
components = [ "basic" "sdk" "sqlplus" ] ++ optional odbcSupport "odbc";
components = [ "basic" "sdk" "sqlplus" "tools" ] ++ optional odbcSupport "odbc";
# determine the version number, there might be different ones per architecture
version = {
@ -28,22 +29,23 @@ let
# hashes per component and architecture
hashes = {
x86_64-linux = {
basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy";
sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99";
basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy";
sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99";
sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5";
odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch";
tools = "1q19blr0gz1c8bq0bnv1njzflrp03hf82ngid966xc6gwmqpkdsk";
odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch";
};
x86_64-darwin = {
basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd";
sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27";
basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd";
sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27";
sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e";
odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725";
tools = "b2bc474f98da13efdbc77fd05f559498cd8c08582c5b9038f6a862215de33f2c";
odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725";
};
}.${stdenv.hostPlatform.system} or throwSystem;
# rels per component and architecture, optional
rels = {
}.${stdenv.hostPlatform.system} or {};
rels = { }.${stdenv.hostPlatform.system} or { };
# convert platform to oracle architecture names
arch = {
@ -70,13 +72,15 @@ let
};
# assemble srcs
srcs = map (component:
(fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or ""))
components;
srcs = map
(component:
(fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or ""))
components;
pname = "oracle-instantclient";
extLib = stdenv.hostPlatform.extensions.sharedLibrary;
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
inherit pname version srcs;
buildInputs = [ stdenv.cc.cc.lib ]
@ -87,13 +91,13 @@ in stdenv.mkDerivation {
++ optional stdenv.isLinux autoPatchelfHook
++ optional stdenv.isDarwin fixDarwinDylibNames;
outputs = [ "out" "dev" "lib"];
outputs = [ "out" "dev" "lib" ];
unpackCmd = "unzip $curSrc";
installPhase = ''
mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib
install -Dm755 {adrci,genezi,uidrvci,sqlplus} $out/bin
install -Dm755 {adrci,genezi,uidrvci,sqlplus,exp,expdp,imp,impdp} $out/bin
# cp to preserve symlinks
cp -P *${extLib}* $lib/lib
@ -124,6 +128,6 @@ in stdenv.mkDerivation {
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ flokli ];
hydraPlatforms = [];
hydraPlatforms = [ ];
};
}

4
pkgs/development/libraries/physics/hepmc3/default.nix
View File

@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec {
pname = "hepmc3";
version = "3.2.3";
version = "3.2.4";
src = fetchurl {
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
sha256 = "sha256-jKrazCyWmIPNH5lLYieV/IhftLFdrYyK5kvL2/DL1H0=";
sha256 = "sha256-4Ij8z9GmwvjhCJ9FcQG+4eXHqXd+nVHGQZyKKIpJ4bs=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/development/node-packages/generate.sh
View File

@ -3,7 +3,7 @@ set -eu -o pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
node2nix=$(nix-build ../../.. -A nodePackages.node2nix)
cd ${DIR}
cd "$DIR"
rm -f ./node-env.nix
${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix
# using --no-out-link in nix-build argument would cause the

20
pkgs/development/python-modules/aiojobs/default.nix
View File

@ -1,22 +1,22 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, pythonOlder
, aiohttp
, pytest
, pytestCheckHook
, pytest-aiohttp
, pygments
, lib
}:
buildPythonPackage rec {
pname = "aiojobs";
version = "0.2.2";
version = "0.3.0";
format = "flit";
disabled = isPy27;
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "01a0msjh4w58fd7jplmblh0hwgpzwjs5xkgqz3d0p5yv3cykwjwf";
sha256 = "sha256-9mMdQtxDCPfYg6u9cNTpdvP8w1o7oejq5dSvSUCh4MM=";
};
nativeBuildInputs = [
@ -28,13 +28,11 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
pytest-aiohttp
];
checkPhase = ''
pytest tests
'';
pythonImportsCheck = [ "aiojobs" ];
meta = with lib; {
homepage = "https://github.com/aio-libs/aiojobs";

4
pkgs/development/python-modules/asgi-csrf/default.nix
View File

@ -11,7 +11,7 @@
}:
buildPythonPackage rec {
version = "0.8";
version = "0.9";
pname = "asgi-csrf";
disabled = isPy27;
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw=";
sha256 = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g=";
};
propagatedBuildInputs = [

7
pkgs/development/python-modules/awkward/default.nix
View File

@ -5,20 +5,21 @@
, numba
, numpy
, pytestCheckHook
, pyyaml
, rapidjson
}:
buildPythonPackage rec {
pname = "awkward";
version = "1.3.0";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "b6021694adec9813842bad1987b837e439dabaf5b0dff9041201d238fca71fb4";
sha256 = "25ae6114d5962c717cb87e3bc30a2f6eaa232b252cf8c51ba805b8f04664ae0d";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ rapidjson ];
buildInputs = [ pyyaml rapidjson ];
propagatedBuildInputs = [ numpy ];
dontUseCmakeConfigure = true;

520
pkgs/development/python-modules/cramjam/Cargo.lock generated Normal file
View File

@ -0,0 +1,520 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "brotli-sys"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "brotli2"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
dependencies = [
"brotli-sys",
"libc",
]
[[package]]
name = "cc"
version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
dependencies = [
"jobserver",
]
[[package]]
name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cramjam"
version = "2.3.2"
dependencies = [
"brotli2",
"flate2",
"lz4",
"mimalloc",
"numpy",
"pyo3",
"snap",
"zstd",
]
[[package]]
name = "crc32fast"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "ctor"
version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
dependencies = [
"quote",
"syn",
]
[[package]]
name = "flate2"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
dependencies = [
"cfg-if 1.0.0",
"crc32fast",
"libc",
"miniz_oxide",
]
[[package]]
name = "ghost"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "indoc"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
dependencies = [
"indoc-impl",
"proc-macro-hack",
]
[[package]]
name = "indoc-impl"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
"syn",
"unindent",
]
[[package]]
name = "instant"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "inventory"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
dependencies = [
"ctor",
"ghost",
"inventory-impl",
]
[[package]]
name = "inventory-impl"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "jobserver"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
dependencies = [
"libc",
]
[[package]]
name = "libc"
version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
[[package]]
name = "libmimalloc-sys"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2396cf99d2f58611cd69f0efeee4af3d2e2c7b61bed433515029163aa567e65c"
dependencies = [
"cc",
]
[[package]]
name = "lock_api"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
dependencies = [
"scopeguard",
]
[[package]]
name = "lz4"
version = "1.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
dependencies = [
"libc",
"lz4-sys",
]
[[package]]
name = "lz4-sys"
version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "matrixmultiply"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
dependencies = [
"rawpointer",
]
[[package]]
name = "mimalloc"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e7c6b11afd1e5e689ac96b6d18b1fc763398fe3d7eed99e8773426bc2033dfb"
dependencies = [
"libmimalloc-sys",
]
[[package]]
name = "miniz_oxide"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg",
]
[[package]]
name = "ndarray"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c0d5c9540a691d153064dc47a4db2504587a75eae07bf1d73f7a596ebc73c04"
dependencies = [
"matrixmultiply",
"num-complex",
"num-integer",
"num-traits",
"rawpointer",
]
[[package]]
name = "num-complex"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
dependencies = [
"num-traits",
]
[[package]]
name = "num-integer"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]
[[package]]
name = "numpy"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7073fae1e0b82409533a29c6f804b79783d7b2d3c07728fdc4d884eda8cd4f0"
dependencies = [
"cfg-if 0.1.10",
"libc",
"ndarray",
"num-complex",
"num-traits",
"pyo3",
]
[[package]]
name = "parking_lot"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
dependencies = [
"instant",
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
dependencies = [
"cfg-if 1.0.0",
"instant",
"libc",
"redox_syscall",
"smallvec",
"winapi",
]
[[package]]
name = "paste"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
dependencies = [
"paste-impl",
"proc-macro-hack",
]
[[package]]
name = "paste-impl"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
dependencies = [
"proc-macro-hack",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro2"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
dependencies = [
"unicode-xid",
]
[[package]]
name = "pyo3"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4837b8e8e18a102c23f79d1e9a110b597ea3b684c95e874eb1ad88f8683109c3"
dependencies = [
"cfg-if 1.0.0",
"ctor",
"indoc",
"inventory",
"libc",
"parking_lot",
"paste",
"pyo3-macros",
"unindent",
]
[[package]]
name = "pyo3-macros"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb"
dependencies = [
"pyo3-macros-backend",
"quote",
"syn",
]
[[package]]
name = "pyo3-macros-backend"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rawpointer"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "redox_syscall"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
dependencies = [
"bitflags",
]
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "smallvec"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "snap"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451"
[[package]]
name = "syn"
version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "unicode-xid"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "unindent"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "zstd"
version = "0.6.1+zstd.1.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
version = "3.0.1+zstd.1.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c"
dependencies = [
"libc",
"zstd-sys",
]
[[package]]
name = "zstd-sys"
version = "1.4.20+zstd.1.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e"
dependencies = [
"cc",
"libc",
]

60
pkgs/development/python-modules/cramjam/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, rustPlatform
, libiconv
, pytestCheckHook
, brotli
, lz4
, memory_profiler
, numpy
, pytest-benchmark
, python-snappy
, zstd
}:
buildPythonPackage rec {
pname = "cramjam";
version = "2.3.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "577955f1510d99df0e4d61379c3f05568f594f91e12bc6a7e147d0abfa643a3b";
};
postPatch = ''
cp ${./Cargo.lock} ./Cargo.lock
'';
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
buildInputs = lib.optional stdenv.isDarwin libiconv;
checkInputs = [
pytestCheckHook
brotli
lz4
memory_profiler
numpy
pytest-benchmark
python-snappy
zstd
];
pytestFlagsArray = [ "--benchmark-disable" ];
pythonImportsCheck = [ "cramjam" ];
meta = with lib; {
description = "Thin Python bindings to de/compression algorithms in Rust";
homepage = "https://crates.io/crates/cramjam";
license = with licenses; [ mit ];
maintainers = with maintainers; [ veprbl ];
};
}

36
pkgs/development/python-modules/fastparquet/default.nix
View File

@ -1,23 +1,43 @@
{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner
, thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
, numba
, numpy
, pandas
, pytestrunner
, cramjam
, fsspec
, thrift
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "fastparquet";
version = "0.5.0";
version = "0.6.3";
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana";
hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY=";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ numba numpy pandas thrift ];
checkInputs = [ pytestCheckHook python-snappy lz4 zstandard zstd ];
propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ];
checkInputs = [ pytestCheckHook ];
# Workaround https://github.com/NixOS/nixpkgs/issues/123561
preCheck = ''
mv fastparquet/test .
rm -rf fastparquet
fastparquet_test="$out"/${python.sitePackages}/fastparquet/test
ln -s `pwd`/test "$fastparquet_test"
'';
postCheck = ''
rm "$fastparquet_test"
'';
# E ModuleNotFoundError: No module named 'fastparquet.speedups'
doCheck = false;
pythonImportsCheck = [ "fastparquet" ];
meta = with lib; {

6
pkgs/development/python-modules/mat2/default.nix
View File

@ -56,6 +56,12 @@ buildPythonPackage rec {
url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch";
sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648";
})
# fix white space error in the tests for exiftool, remove for next release
(fetchpatch {
name = "fix-tests-exiftool.patch";
url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch";
sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x";
})
];
postPatch = ''

4
pkgs/development/python-modules/poetry/default.nix
View File

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "poetry";
version = "1.1.6";
version = "1.1.7";
format = "pyproject";
disabled = isPy27;
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = pname;
rev = version;
sha256 = "sha256-3Nx9xuQMIho+oRjqskHL9eQGKDAWntEGZcWe7evnmNU=";
sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d";
};
postPatch = ''

23
pkgs/development/python-modules/python-registry/default.nix
View File

@ -1,16 +1,20 @@
{ lib
, buildPythonPackage
, fetchPypi
, enum-compat
, fetchFromGitHub
, pytestCheckHook
, unicodecsv
}:
buildPythonPackage rec {
pname = "python-registry";
version = "1.3.1";
version = "1.4";
src = fetchPypi {
inherit pname version;
sha256 = "99185f67d5601be3e7843e55902d5769aea1740869b0882f34ff1bd4b43b1eb2";
src = fetchFromGitHub {
owner = "williballenthin";
repo = pname;
rev = version;
sha256 = "0gwx5jcribgmmbz0ikhz8iphz7yj2d2nmk24nkdrjd3y5irly11s";
};
propagatedBuildInputs = [
@ -18,8 +22,13 @@ buildPythonPackage rec {
unicodecsv
];
# no tests
doCheck = false;
checkInputs = [
pytestCheckHook
];
disabledTestPaths = [
"samples"
];
pythonImportsCheck = [
"Registry"

4
pkgs/development/python-modules/scp/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "scp";
version = "0.13.5";
version = "0.13.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA=";
sha256 = "sha256-CnL514LpaLCbEU1WB/lrHxb+mUKFevs1U5nt1VNy/PE=";
};
propagatedBuildInputs = [

10
pkgs/os-specific/linux/bluez/default.nix
View File

@ -3,9 +3,11 @@
, fetchurl
, alsa-lib
, dbus
, ell
, glib
, json_c
, libical
, docutils
, pkg-config
, python3
, readline
@ -19,16 +21,17 @@
];
in stdenv.mkDerivation rec {
pname = "bluez";
version = "5.58";
version = "5.60";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8";
sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ=";
};
buildInputs = [
alsa-lib
dbus
ell
glib
json_c
libical
@ -38,6 +41,7 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [
docutils
pkg-config
python3.pkgs.wrapPython
];
@ -60,6 +64,7 @@ in stdenv.mkDerivation rec {
"--enable-library"
"--enable-cups"
"--enable-pie"
"--enable-external-ell"
"--with-dbusconfdir=${placeholder "out"}/share"
"--with-dbussystembusdir=${placeholder "out"}/share/dbus-1/system-services"
"--with-dbussessionbusdir=${placeholder "out"}/share/dbus-1/services"
@ -72,7 +77,6 @@ in stdenv.mkDerivation rec {
"--enable-nfc"
"--enable-sap"
"--enable-sixaxis"
"--enable-wiimote"
];
# Work around `make install' trying to create /var/lib/bluetooth.

4
pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }:
stdenv.mkDerivation rec {
pname = "fts-xapian";
version = "1.4.9";
version = "1.4.11";
src = fetchFromGitHub {
owner = "grosjo";
repo = "fts-xapian";
rev = version;
sha256 = "0p4ps9h24vr9bldrcf9cdx6l4rdz5i8zyc58qp10h7cc3jilwddy";
sha256 = "sha256-HPmS2Z1PIEM9fc6EerCEigQJg5BK/115zOW2uxFqjP0=";
};
buildInputs = [ dovecot xapian icu64 ];

11
pkgs/servers/monitoring/grafana-agent/default.nix
View File

@ -2,16 +2,21 @@
buildGoModule rec {
pname = "grafana-agent";
version = "0.15.0";
version = "0.16.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "agent";
sha256 = "sha256-mRDd9G/VMbDwp/GYPoUE0v9j+BmUd08wOMJjgcg2qdo=";
sha256 = "0kqbn6fqlrxjqdkkhbr7qmm2m05a7dlskfdb7y4gr5ggi65m6ik5";
};
vendorSha256 = "sha256-sQFWdBOjfYb1e7ZzHGgtgnuEQCU4xnkJTyzC/9DRcYs=";
vendorSha256 = "0xi69a1zkcmi5q8m7lfwp3xb4cbkwc2dzqm24lfqsq13xj5jq6ph";
patches = [
# https://github.com/grafana/agent/issues/731
./skip_test_requiring_network.patch
];
# uses go-systemd, which uses libsystemd headers
# https://github.com/coreos/go-systemd/issues/351

15
pkgs/servers/monitoring/grafana-agent/skip_test_requiring_network.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/pkg/operator/selector_eventhandler_test.go b/pkg/operator/selector_eventhandler_test.go
index 7b6ec602..e79bae0e 100644
--- a/pkg/operator/selector_eventhandler_test.go
+++ b/pkg/operator/selector_eventhandler_test.go
@@ -39,6 +39,10 @@ var (
// TestEnqueueRequestForSelector creates an example Kubenretes cluster and runs
// EnqueueRequestForSelector to validate it works.
func TestEnqueueRequestForSelector(t *testing.T) {
+ // Requires network access, which is not available during
+ // the nixpkgs sandboxed build
+ t.Skip()
+
l := log.NewNopLogger()
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)

4
pkgs/tools/archivers/p7zip/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "17.04";
src = fetchFromGitHub {
owner = "szcnick";
owner = "jinfeihan57";
repo = pname;
rev = "v${version}";
sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18=";
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
meta = {
homepage = "https://github.com/szcnick/p7zip";
homepage = "https://github.com/jinfeihan57/p7zip";
description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.raskin ];

4
pkgs/tools/networking/curlie/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "curlie";
version = "1.6.0";
version = "1.6.2";
src= fetchFromGitHub {
owner = "rs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8=";
sha256 = "sha256-2CZpqc1MnAY6M1UFakKLaqGjaifw+7bN4hxc0jWgSps=";
};
vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-07-09";
version = "2021-07-10";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-FjiQ+L3eW+od41Vz00t/LhagS3SUT+PA5GvtZ6lhoFU=";
sha256 = "sha256-xxlG8N6/WC/9bjY3fzopXIq0l7c81Rs0NdjVE4N5JNI=";
};
installPhase = ''

2
pkgs/tools/security/volatility/default.nix
View File

@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
doCheck = false;
propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ];
propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ];
meta = with lib; {
homepage = "https://www.volatilityfoundation.org/";

4
pkgs/tools/system/gdu/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
version = "5.1.1";
version = "5.2.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9o/njurf1AWt04A8u38FMFcteLZlRHDejbH9+ekDjKI=";
sha256 = "sha256-PByW1wj9B6aJhYZYPT1uUDUDVtZHGYC2ingvxdr8Gbc=";
};
vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc=";

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

@ -3889,7 +3889,9 @@ in
cloud-utils = callPackage ../tools/misc/cloud-utils { };
cobalt = callPackage ../applications/misc/cobalt { };
cobalt = callPackage ../applications/misc/cobalt {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
cocoapods = callPackage ../development/mobile/cocoapods { };
@ -10754,6 +10756,8 @@ in
fasmg = callPackage ../development/compilers/fasmg { };
fennel = callPackage ../development/compilers/fennel { };
flasm = callPackage ../development/compilers/flasm { };
flyctl = callPackage ../development/web/flyctl { };
@ -30971,11 +30975,11 @@ in
# Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
inherit (callPackage ../applications/networking/cluster/kops {})
mkKops
kops_1_18
kops_1_19
kops_1_20
kops_1_21
;
kops = kops_1_20;
kops = kops_1_21;
lguf-brightness = callPackage ../misc/lguf-brightness { };

18
pkgs/top-level/perl-packages.nix
View File

@ -10793,25 +10793,15 @@ let
};
};
ImageExifTool = buildPerlPackage {
ImageExifTool = buildPerlPackage rec {
pname = "Image-ExifTool";
version = "12.16";
version = "12.29";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz";
sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61";
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95";
};
patches = [
# Unfortunately, not every release is uploaded to CPAN so security fixes
# would need to be cherry-picked from releases
(fetchpatch {
name = "CVE-2021-22204.patch";
url = "https://salsa.debian.org/perl-team/modules/packages/libimage-exiftool-perl/-/raw/0347501fda93cb8366d6451aedcf258b34fb4a2b/debian/patches/CVE-2021-22204.patch";
sha256 = "1fxw32zcssillnv764wsd05lyswn8bbrc90q5cy9aknx0ncgsrxj";
})
];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/exiftool

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

@ -1670,6 +1670,8 @@ in {
cram = callPackage ../development/python-modules/cram { };
cramjam = callPackage ../development/python-modules/cramjam { };
crashtest = callPackage ../development/python-modules/crashtest { };
crate = callPackage ../development/python-modules/crate { };