ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-25 14:48:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-25 06:01:34 +00:00 committed by GitHub
commit 0b9f14a636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 1253 additions and 1042 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1530
pkgs/applications/blockchains/polkadot/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.41";
version = "0.9.42";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
hash = "sha256-wjV/+2n9B617S6MxC48vtpbBBKGCWBEjRj7K6m630Mo=";
hash = "sha256-W7mD/PLrub5u9GIN8qiTWNsTfirx0aBF2Lu+2PMoxOg=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"binary-merkle-tree-4.0.0-dev" = "sha256-ngtW11MGs+fcuCp9J5NH+dYJeK4YM5vWpRk0OuLYHus=";
"binary-merkle-tree-4.0.0-dev" = "sha256-PEPmG+39YqPQOzT8u1SNTCrVwNWErifBCVz+l8TvdyE=";
"sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
};
};

21
pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix
View File

@ -1,24 +1,17 @@
{ lib, stdenv, fetchurl, emacs }:
{ lib, trivialBuild, fetchurl, haskell-mode }:
# this package installs the emacs-mode which
# resides in the hsc3 sources.
let version = "0.15";
in stdenv.mkDerivation {
trivialBuild rec {
pname = "hsc3-mode";
inherit version;
version = "0.15";
src = fetchurl {
url = "mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz";
url = "mirror://hackage/hsc3-${version}/hsc3-${version}.tar.gz";
sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
};
buildInputs = [ emacs ];
packageRequires = [ haskell-mode ];
installPhase = ''
mkdir -p "$out/share/emacs/site-lisp"
cp "emacs/hsc3.el" "$out/share/emacs/site-lisp"
'';
sourceRoot = "hsc3-${version}/emacs";
meta = {
homepage = "http://rd.slavepianos.org/?t=hsc3";

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

@ -428,11 +428,11 @@
"vendorHash": null
},
"gitlab": {
"hash": "sha256-QH47lBtwlpW9Trb7EAmE9eNEme6PDyKUJ50QevD5GBs=",
"hash": "sha256-zNwjTIt7ngDkHd3VpHkA4xKDjsxQ7vJaWtLH4pMl3S0=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v16.0.2",
"rev": "v16.0.3",
"spdx": "MPL-2.0",
"vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY="
},
@ -810,11 +810,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-TnCRDWmlyBYOY1lpYP0evguM6wFszZdOdmFsztdbRrc=",
"hash": "sha256-RMWKzIsZg9h5COgt1IlpmQQGDpFHwH4ugPZmMULcxgg=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.121.0",
"rev": "v4.122.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

28
pkgs/applications/networking/mpop/default.nix
View File

@ -2,11 +2,17 @@
, stdenv
, fetchurl
, gnutls
, openssl
, gsasl
, libidn
, pkg-config
, Security
, nlsSupport ? true
, idnSupport ? true
, gsaslSupport ? true
, sslLibrary ? "gnutls"
}:
assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"];
stdenv.mkDerivation rec {
pname = "mpop";
@ -21,17 +27,19 @@ stdenv.mkDerivation rec {
pkg-config
];
buildInputs = [
gnutls
gsasl
libidn
] ++ lib.optionals stdenv.isDarwin [
Security
];
buildInputs =
lib.optional stdenv.isDarwin Security
++ lib.optional gsaslSupport gsasl
++ lib.optional idnSupport libidn
++ lib.optional (sslLibrary == "gnutls") gnutls
++ lib.optional (sslLibrary == "openssl") openssl;
configureFlags = lib.optionals stdenv.isDarwin [
"--with-macosx-keyring"
];
configureFlags = [
(lib.enableFeature nlsSupport "nls")
(lib.withFeature idnSupport "idn")
(lib.withFeature gsaslSupport "gsasl")
"--with-tls=${sslLibrary}"
] ++ lib.optional stdenv.isDarwin "--with-macosx-keyring";
meta = with lib;{
description = "POP3 mail retrieval agent";

597
pkgs/applications/version-management/sapling/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/version-management/sapling/default.nix
View File

@ -45,7 +45,7 @@ let
owner = "facebook";
repo = "sapling";
rev = version;
hash = "sha256-r15qzyMoZDCkSnYp69bOR2wuweIcbDc7F3FibBVE/qM=";
hash = "sha256-NwOexCU+TdZAdruivqRuqhwt0veryeGykLdH6vth+p4=";
};
addonsSrc = "${src}/addons";
@ -53,7 +53,7 @@ let
# Fetches the Yarn modules in Nix to to be used as an offline cache
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${addonsSrc}/yarn.lock";
sha256 = "sha256-cEIij7hocCSPw1Q1ESI/t9IFmLM0Nbr/IjSz3HzBdzU=";
sha256 = "sha256-AlY7/cdGr4i87+wMhPBh/+LFDoF8aC23OLDEHu9lYqU=";
};
# Builds the NodeJS server that runs with `sl web`
@ -103,10 +103,10 @@ python3Packages.buildPythonApplication {
lockFile = ./Cargo.lock;
outputHashes = {
"abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM=";
"cloned-0.1.0" = "sha256-bgI2/Sb+jKylPt5OqhfzcWGh1N8S0zFk/yYOwv461Io=";
"fb303_core-0.0.0" = "sha256-Rd42P2PPPgk9ohg45Lq067KcJBJ3Bw3IroYsH0YNh6s=";
"fbthrift-0.0.1+unstable" = "sha256-/d8EJoPlSHRlkE7/d5OEy2/SEmPQyS6eUInbm/zYWH8=";
"serde_bser-0.3.1" = "sha256-tfkIGQKi+eRnBUYEmoc3m+mb93tFdh/g5FPUAXYRMVM=";
"cloned-0.1.0" = "sha256-MKyj91z+hciJOg4Lhb6ik7zUgCwuHsX8N9HVSP2JkKE=";
"fb303_core-0.0.0" = "sha256-5AU54rpeDub2Iol56S4X+xfdU07zWAtOyCNRBZLzUZA=";
"fbthrift-0.0.1+unstable" = "sha256-n4ES6zRyTgsNxbrM4AUraJ6W4tLHiKdfSyL3Yd0ET34=";
"serde_bser-0.3.1" = "sha256-PkQx2/axT/7LQ4Mvfz1AYBWKXGvaTHkOP2jtljvuYxY=";
};
};
postPatch = ''

4
pkgs/applications/version-management/sapling/deps.json generated
View File

@ -73,6 +73,6 @@
"url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz"
}
],
"version": "0.2.20230426-145232+7ea1f245",
"versionHash": "7478665112005955779"
"version": "0.2.20230523-092610+f12b7eee",
"versionHash": "11350811807294821405"
}

4
pkgs/development/compilers/flix/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "flix";
version = "0.36.0";
version = "0.37.0";
src = fetchurl {
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
sha256 = "sha256-HAhNNg8f+uC2QKYqkugJIyH7VakNA631S2/UE2vG+5M=";
sha256 = "sha256-7Hny8Y74Ihptto4LkvANStUAwBQBrNlwjQ5PqBwsbW0=";
};
dontUnpack = true;

8
pkgs/development/interpreters/wasmtime/default.nix
View File

@ -2,23 +2,23 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "9.0.0";
version = "9.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-9ga7BKJoaw7naX8t4o+zNnWkjIvSII5oVRM0dYMrseo=";
hash = "sha256-6pZZawygFxE5rWkdJUaJLxTd5pZiC0o1Rvc5Zl6YJpw=";
fetchSubmodules = true;
};
cargoHash = "sha256-GkL78aAIGdSlcxeRTIVp1jcXIg1ZtvB2LNIoPEViNcs=";
cargoHash = "sha256-GUYd5/1pekOHG1e0WBxjOe3/foZ5YdU2ovF0btZ6+ec=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optional stdenv.isDarwin Security;
# SIMD tests are only executed on platforms that support all
# required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64):

4
pkgs/development/ocaml-modules/owl-base/default.nix
View File

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "owl-base";
version = "1.0.2";
version = "1.1";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
hash = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM=";
hash = "sha256-mDYCZ2z33VTEvc6gV4JTecIXA/vHIWuU37BADGl/yog=";
};
minimalOCamlVersion = "4.10";

4
pkgs/development/ocaml-modules/owl/default.nix
View File

@ -3,7 +3,7 @@
, dune-configurator
, fetchFromGitHub
, alcotest
, eigen
, ctypes
, stdio
, openblasCompat
, owl-base
@ -21,7 +21,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
buildInputs = [ dune-configurator stdio ];
propagatedBuildInputs = [
eigen
ctypes
openblasCompat
owl-base
npy

16
pkgs/development/python-modules/macfsevents/default.nix
View File

@ -1,12 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, CoreFoundation, CoreServices }:
{ lib
, buildPythonPackage
, fetchPypi
, CoreFoundation
, CoreServices
}:
buildPythonPackage rec {
pname = "MacFSEvents";
version = "0.8.1";
version = "0.8.4";
src = fetchPypi {
inherit pname version;
sha256 = "1324b66b356051de662ba87d84f73ada062acd42b047ed1246e60a449f833e10";
sha256 = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs=";
};
buildInputs = [ CoreFoundation CoreServices ];
@ -14,9 +19,12 @@ buildPythonPackage rec {
# Some tests fail under nix build directory
doCheck = false;
pythonImportsCheck = [ "fsevents" ];
meta = with lib; {
homepage = "https://github.com/malthe/macfsevents";
description = "Thread-based interface to file system observation primitives";
homepage = "https://github.com/malthe/macfsevents";
changelog = "https://github.com/malthe/macfsevents/blob/${version}/CHANGES.rst";
license = licenses.bsd2;
maintainers = [ maintainers.marsam ];
platforms = platforms.darwin;

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

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "pyatv";
version = "0.12.0";
version = "0.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "v${version}";
hash = "sha256-t7H4ut4atc2XDnpBzV03Q/OrCHMVmZk38r/iWcLKL7Q=";
hash = "sha256-HWr+Pu/tMuCDFC2mV3R/Wqe0PfVw/DDgEIYBRnfYx/I=";
};
postPatch = ''

6
pkgs/development/tools/sentry-cli/default.nix
View File

@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "2.17.5";
version = "2.18.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-7qBw0MT1FM1rAbOEtVuf/XEBY8yosRWsnGwVbqpc3QQ=";
sha256 = "sha256-ZHhx31V67cZEusbOKFfgNWxXlriS9brlExYG6Z3JjlE=";
};
doCheck = false;
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ];
cargoHash = "sha256-LAasV0rY4jgoC+soBshECUXvXYIe5zQZmnKtBONAD6g=";
cargoHash = "sha256-ovRdso1ke4e4rQijORxMixSDdjns6tEIK+SLjLv+AV4=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";

15
pkgs/os-specific/linux/firmware/linux-firmware/update.sh
View File

@ -2,19 +2,24 @@
set -euo pipefail
cd "$(dirname "$(readlink -f "$0")")" || exit
# step 1: figure out the latest version from the tags
repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
latestTag="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)"
# step 1: figure out the latest version from the tags
if [ -z "$1" ]; then
version="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)"
else
version=$1
fi
# step 2: prefetch the source tarball
snapshotUrl="$repo/snapshot/linux-firmware-$latestTag.tar.gz"
snapshotUrl="$repo/snapshot/linux-firmware-$version.tar.gz"
hash="$(nix-prefetch-url --unpack "$snapshotUrl")"
sriHash="$(nix --experimental-features nix-command hash to-sri "sha256:$hash")"
# step 3: rebuild as a non-FO derivation to get the right hash
cat > source.nix << EOF
{
version = "$latestTag";
version = "$version";
sourceHash = "$sriHash";
outputHash = null;
}
@ -27,7 +32,7 @@ outHash="$(nix --experimental-features nix-command hash path "$outPath")"
cat > source.nix << EOF
# This file is autogenerated! Run ./update.sh to regenerate.
{
version = "$latestTag";
version = "$version";
sourceHash = "$sriHash";
outputHash = "$outHash";
}

4
pkgs/shells/murex/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "murex";
version = "4.1.5200";
version = "4.1.6140";
src = fetchFromGitHub {
owner = "lmorg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-O0Hr2u/2WmJGbpOW0IRQfKQbxWl/IwK/6S2t5g5NAZ8=";
sha256 = "sha256-1MFFAdmFtLZ0QlplgBHUb4g9bGmYX9445q9UFMh4OPE=";
};
vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU=";

6
pkgs/tools/admin/afterburn/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "afterburn";
version = "5.4.1";
version = "5.4.2";
src = fetchFromGitHub {
owner = "coreos";
repo = "afterburn";
rev = "v${version}";
sha256 = "sha256-QsdTrd9p89SiLCmvNlsLk9ET2BVeaJncDyWzycn5CLw=";
sha256 = "sha256-MJPJAzAzlfOEgTErwnXKWUChjy7tWQxjNX87c76bBNY=";
};
cargoHash = "sha256-lCtG7UmXJegGVbjyYn9YJWSynikOK4qPmLS1XNesMUk=";
cargoHash = "sha256-OuN36DTLuVHwB/zKiQoTda6gYHLpX9Z/WBD1me6xpKM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];

4
pkgs/tools/misc/dupd/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "dupd";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "jvirkki";
repo = "dupd";
rev = version;
sha256 = "sha256-jDFPvJqIUEu0/8bvq2PaaA1NnWakApegW8bxn+NKffs=";
sha256 = "sha256-Jl95Ke1AntYeTKARQTXm5qMhwISEw4Pvnr6I2WEFlP4=";
};
postPatch = ''

4
pkgs/tools/misc/fluent-bit/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
version = "2.1.2";
version = "2.1.3";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
sha256 = "sha256-AdIK1qNM2mUC/dLNN5GqYzi9ulqViqsyyd1mvHRfeIM=";
sha256 = "sha256-zNNqJbMVFNq82SKmlvU1rhjg549eH6rzrm2/mb1jM7E=";
};
nativeBuildInputs = [ cmake flex bison ];

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-05-24";
version = "2023-05-25";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-v86QCe6kM5L83z7V0Rf7uzSSXPJxVTY0IPdg5Qzzkfg=";
hash = "sha256-W2+54iIg2msExr9SxR8EEnsF0a0nfAgHfXI0wZN8lIw=";
};
nativeBuildInputs = [

6
pkgs/tools/security/grype/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "grype";
version = "0.61.1";
version = "0.62.1";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ey0g7iog7PHxqgVaJROA2Myi4hGRe14RuA8tBTSc7Ok=";
hash = "sha256-DuM4hgM8jXFSoNQv8wI5Mkpzy37txNey1CSeMJH888s=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-NMKdMW/DRod/C5nL8GZR0pKTRzF58dARoWQD1o+i3Y4=";
vendorHash = "sha256-GSVKeaAf4/6SWHdh+zRhFnzyJ4tv4yGGh0YfKTa0aLQ=";
nativeBuildInputs = [
installShellFiles