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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-31 12:03:07 +00:00 committed by GitHub
commit 1caa752d4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 131 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/services/networking/seafile.nix
View File

@ -19,6 +19,8 @@ let
MEDIA_ROOT = '${seahubDir}/media/' MEDIA_ROOT = '${seahubDir}/media/'
THUMBNAIL_ROOT = '${seahubDir}/thumbnail/' THUMBNAIL_ROOT = '${seahubDir}/thumbnail/'
SERVICE_URL = '${cfg.ccnetSettings.General.SERVICE_URL}'
with open('${seafRoot}/.seahubSecret') as f: with open('${seafRoot}/.seahubSecret') as f:
SECRET_KEY = f.readline().rstrip() SECRET_KEY = f.readline().rstrip()
@ -177,6 +179,7 @@ in {
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "seafile.target" ]; wantedBy = [ "seafile.target" ];
restartTriggers = [ ccnetConf seafileConf ]; restartTriggers = [ ccnetConf seafileConf ];
path = [ pkgs.sqlite ];
serviceConfig = securityOptions // { serviceConfig = securityOptions // {
User = "seafile"; User = "seafile";
Group = "seafile"; Group = "seafile";
@ -200,11 +203,11 @@ in {
if [ ! -f "${seafRoot}/server-setup" ]; then if [ ! -f "${seafRoot}/server-setup" ]; then
mkdir -p ${dataDir}/library-template mkdir -p ${dataDir}/library-template
mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr} mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr}
${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql"
${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql"
${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql"
${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql"
${pkgs.sqlite}/bin/sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql"
echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup
fi fi
# checking for upgrades and handling them # checking for upgrades and handling them
@ -213,7 +216,14 @@ in {
installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2)
pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1)
pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2)
if [ $installedMajor != $pkgMajor ] || [ $installedMinor != $pkgMinor ]; then
if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then
:
elif [[ $installedMajor == 8 && $installedMinor == 0 && $pkgMajor == 9 && $pkgMinor == 0 ]]; then
# Upgrade from 8.0 to 9.0
sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/9.0.0/sqlite3/seafile.sql"
echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup
else
echo "Unsupported upgrade" >&2 echo "Unsupported upgrade" >&2
exit 1 exit 1
fi fi

44
pkgs/applications/misc/dbx/default.nix
View File

@ -18,25 +18,22 @@
, pytestCheckHook , pytestCheckHook
, pytest-asyncio , pytest-asyncio
, pytest-timeout , pytest-timeout
, pytest-mock
, lib , lib
, git
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dbx"; pname = "dbx";
version = "0.5.0"; version = "0.6.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "databrickslabs"; owner = "databrickslabs";
repo = "dbx"; repo = "dbx";
rev = "v${version}"; rev = "v${version}";
sha256 = "gd466hhyTfPZwC3B3LlydRrkDtfzjY7SvTKy13HDFG8="; sha256 = "sha256-Ou+VdHFVQzmsxJiyaeDd/+FqHvJZeNGB+OXyoagJwtk=";
}; };
postPatch = ''
substituteInPlace setup.py \
--replace "protobuf==4.21.1" "protobuf>=3.19.4"
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
databricks-cli databricks-cli
scipy scipy
@ -59,36 +56,15 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
pytest-asyncio pytest-asyncio
pytest-timeout pytest-timeout
pytest-mock
git
]; ];
preCheck = ''
export HOME=$TMPDIR
'';
disabledTests = [ disabledTests = [
# require a HOME for cookiecutter
"test_configure"
"test_datafactory_deploy"
"test_deploy_incorrect_artifact_location"
"test_deploy_listed_jobs"
"test_deploy_multitask_json"
"test_deploy_multitask_yaml"
"test_deploy_non_existent_env"
"test_deploy_path_adjustment_json"
"test_deploy_path_adjustment_yaml"
"test_deploy_with_jobs"
"test_deploy_with_requirements_and_branch"
"test_deployment_with_bad_env_variable"
"test_update_job_negative"
"test_update_job_positive"
"test_with_permissions"
"test_write_specs_to_file"
"test_awake_cluster"
"test_execute"
"test_preprocess_cluster_args"
"test_launch"
"test_launch_run_submit"
"test_launch_with_parameters"
"test_no_runs"
"test_no_runs_run_submit"
"test_payload_keys"
"test_trace_runs"
# fails because of dbfs CLI wrong call # fails because of dbfs CLI wrong call
"test_dbfs_unknown_user" "test_dbfs_unknown_user"
"test_dbfs_no_root" "test_dbfs_no_root"

4
pkgs/applications/misc/obsidian/default.nix
View File

@ -12,7 +12,7 @@
let let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
pname = "obsidian"; pname = "obsidian";
version = "0.14.15"; version = "0.15.9";
appname = "Obsidian"; appname = "Obsidian";
meta = with lib; { meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl { src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ="; sha256 = if stdenv.isDarwin then "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw=";
}; };
icon = fetchurl { icon = fetchurl {

4
pkgs/applications/misc/syncthingtray/default.nix
View File

@ -21,14 +21,14 @@
}: }:
mkDerivation rec { mkDerivation rec {
version = "1.1.20"; version = "1.2.1";
pname = "syncthingtray"; pname = "syncthingtray";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = "syncthingtray"; repo = "syncthingtray";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-T0ddAROwVSh+IKGZZNDMC7YB2IfQZal2pAQ5ArirtjI="; sha256 = "sha256-qcfmePPSuaCydATNhUCZ9ee9tV1KqclP9PPX6UPILTM=";
}; };
buildInputs = [ buildInputs = [

6
pkgs/applications/misc/taskwarrior-tui/default.nix
View File

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "taskwarrior-tui"; pname = "taskwarrior-tui";
version = "0.22.0"; version = "0.23.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kdheepak"; owner = "kdheepak";
repo = "taskwarrior-tui"; repo = "taskwarrior-tui";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-121TfmaWrWppsOiuF+8gxy+3J5YzbliYj88nw4aLt9w="; sha256 = "sha256-/f68TlNuaEyPDSBpMmOjZkLF6Is2+oYfbWQqQOnsR4M=";
}; };
# Because there's a test that requires terminal access # Because there's a test that requires terminal access
doCheck = false; doCheck = false;
cargoSha256 = "sha256-oTb1pSA9g9cExCXKaQjNm+h5WB4bWuqODkU7MvvspGQ="; cargoSha256 = "sha256-sgwT0CLFdmzh7dezVE5tcmGCXqxnGLT00IDIQJl6pHw=";
meta = with lib; { meta = with lib; {
description = "A terminal user interface for taskwarrior "; description = "A terminal user interface for taskwarrior ";

4
pkgs/applications/misc/xmrig/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xmrig"; pname = "xmrig";
version = "6.17.0"; version = "6.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmrig"; owner = "xmrig";
repo = "xmrig"; repo = "xmrig";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-K8mN3Wzlay2Qgoo70mu3Bh4lXUXNDpXYt17aNnwWkIc="; sha256 = "sha256-vYXDQSEhPi/jxCO6pxOJ1q0AoBVVRU9vErtJLq90ltk=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/applications/misc/xmrig/moneroocean.nix
View File

@ -2,13 +2,13 @@
xmrig.overrideAttrs (oldAttrs: rec { xmrig.overrideAttrs (oldAttrs: rec {
pname = "xmrig-mo"; pname = "xmrig-mo";
version = "6.16.5-mo1"; version = "6.18.0-mo1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MoneroOcean"; owner = "MoneroOcean";
repo = "xmrig"; repo = "xmrig";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-TNiHvRLS+eAPHa+qbnVSAyWTPGJxdp9eheQamd4i24E="; sha256 = "sha256-Ma5wXaQBAVWJsL2wVOHxQ2aSAG9wOywk/abtUi03JvY=";
}; };
meta = with lib; { meta = with lib; {

13
pkgs/applications/networking/seahub/default.nix
View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, python3 , python3
, makeWrapper , makeWrapper
, nixosTests
}: }:
let let
# Seahub 8.x.x does not support django-webpack-loader >=1.x.x # Seahub 8.x.x does not support django-webpack-loader >=1.x.x
@ -19,13 +20,13 @@ let
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "seahub"; pname = "seahub";
version = "8.0.8"; version = "9.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seahub"; repo = "seahub";
rev = "c51346155b2f31e038c3a2a12e69dcc6665502e2"; # using a fixed revision because upstream may re-tag releases :/ rev = "876b7ba9b680fc668e89706aff535593772ae921"; # using a fixed revision because upstream may re-tag releases :/
sha256 = "0dagiifxllfk73xdzfw2g378jccpzplhdrmkwbaakbhgbvvkg92k"; sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds=";
}; };
dontBuild = true; dontBuild = true;
@ -52,6 +53,7 @@ python.pkgs.buildPythonApplication rec {
openpyxl openpyxl
requests requests
requests-oauthlib requests-oauthlib
chardet
pyjwt pyjwt
pycryptodome pycryptodome
qrcode qrcode
@ -68,7 +70,10 @@ python.pkgs.buildPythonApplication rec {
passthru = { passthru = {
inherit python; inherit python;
pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
tests = {
inherit (nixosTests) seafile;
};
}; };
meta = with lib; { meta = with lib; {

4
pkgs/applications/networking/sync/unison/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unison"; pname = "unison";
version = "2.52.0"; version = "2.52.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bcpierce00"; owner = "bcpierce00";
repo = "unison"; repo = "unison";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YCuXkHqY+JHsguvst2UkI/6YlFt3iTvchO8PQuS15nI="; sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ=";
}; };
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ]

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "z88dk"; pname = "z88dk";
version = "2.1"; version = "2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "z88dk"; owner = "z88dk";
repo = "z88dk"; repo = "z88dk";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NgO8rbM31IX4nrJRU0p1DUafHPagMQepKLLoOLuGlT8="; sha256 = "sha256-vf/hEmcl6R3nsc66G6eETNeW0SV/odk14XIpEPPAbKo=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

5
pkgs/development/go-modules/generic/default.nix
View File

@ -106,7 +106,10 @@ let
mkdir -p "''${GOPATH}/pkg/mod/cache/download" mkdir -p "''${GOPATH}/pkg/mod/cache/download"
go mod download go mod download
'' else '' '' else ''
go mod vendor if (( "''${NIX_DEBUG:-0}" >= 1 )); then
goModVendorFlags+=(-v)
fi
go mod vendor "''${goModVendorFlags[@]}"
''} ''}
mkdir -p vendor mkdir -p vendor

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

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasmer"; pname = "wasmer";
version = "2.1.1"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wasmerio"; owner = "wasmerio";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-uD+JH42AxXxLMLqBurNDfYc7tLlBlEmaLB5rbip+/D4="; sha256 = "sha256-25wWgMNybbsEf/1xmm+8BPcjx8CSW9ZBzxGKT/DbBXw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "sha256-eiX5p2qWUZgoHzoHYXDsp9N6foiX3JovKO6MpoJOXFo="; cargoSha256 = "sha256-tswsbijNN5UcSZovVmy66yehcEOpQDGMdRgR/1mkuE8=";
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
]; ];
# Can't use test-jit: # Can't use test-jit:
# error: Package `wasmer-workspace v2.1.1 (/build/source)` does not have the feature `test-jit` # error: Package `wasmer-workspace v2.3.0 (/build/source)` does not have the feature `test-jit`
checkFeatures = [ "test-cranelift" ]; checkFeatures = [ "test-cranelift" ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "codec2"; pname = "codec2";
version = "1.0.3"; version = "1.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drowe67"; owner = "drowe67";
repo = "codec2"; repo = "codec2";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-2/Ef5cEe7Kr3a/D8u4BgvTQM6M6vglXsF+ccstFHDUw="; hash = "sha256-Q5p6NicwmHBR7drX8Tdgf6Mruqssg9qzMC9sG9DlMbQ=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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

@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "ucx"; pname = "ucx";
version = "1.12.1"; version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openucx"; owner = "openucx";
repo = "ucx"; repo = "ucx";
rev = "v${version}"; rev = "v${version}";
sha256 = "08ajhbhzwkfzhkhswk56zx17q18ii67dg1ca1f5grl9qjgj3mmyw"; sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg=";
}; };
nativeBuildInputs = [ autoreconfHook doxygen ]; nativeBuildInputs = [ autoreconfHook doxygen ];

4
pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-recoveryservices"; pname = "azure-mgmt-recoveryservices";
version = "2.0.0"; version = "2.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; sha256 = "sha256-2DeOemVpkjeI/hUdG04IuHU2h3cmk3oG4kr1wIDvdbM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nose2"; pname = "nose2";
version = "0.11.0"; version = "0.12.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-bSCNfW7J+dVcdNrIHJOUvDkG2++BqMpUILK5t/jmnek="; hash = "sha256-lW55ub1VjuCLYgDAWtLHZGW344YMDAU3aGCJKFwyARM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyotgw"; pname = "pyotgw";
version = "2.0.0"; version = "2.0.1";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mvn23"; owner = "mvn23";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-82pGKcF7L7WBxInU7lkYTKQLkse5/HY8x0ZHZIyqCW4="; hash = "sha256-2mO8/qBG01zR0LHS4ajaNHrPsM//4i4gKnviy2aGeRs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/tools/analysis/tflint/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint"; pname = "tflint";
version = "0.39.0"; version = "0.39.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hyaYHn2Hzq6k4HSSy86zloLG1Sy/hpHpmj1xUD2UoG8="; sha256 = "sha256-ELf1keTf/iznOBZNvyliAH/4UQo5w8CNEJNf0Z6eDV8=";
}; };
vendorSha256 = "sha256-6sk1bFuSCrKt9uMrrwOpX/SBZrjFvtqVPFylbRNHpz4="; vendorSha256 = "sha256-6sk1bFuSCrKt9uMrrwOpX/SBZrjFvtqVPFylbRNHpz4=";

4
pkgs/development/tools/misc/ccls/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ccls"; pname = "ccls";
version = "0.20210330"; version = "0.20220729";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MaskRay"; owner = "MaskRay";
repo = "ccls"; repo = "ccls";
rev = version; rev = version;
sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8="; sha256 = "sha256-eSWgk6KdEyjDLPc27CsOCXDU7AKMoXNyzoA6dSwZ5TI=";
}; };
nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];

4
pkgs/development/tools/pip-audit/default.nix
View File

@ -25,14 +25,14 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "pip-audit"; pname = "pip-audit";
version = "2.4.2"; version = "2.4.3";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trailofbits"; owner = "trailofbits";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GH7dP2/0j2bXqw1qssyzMSV/YtYImbT7VSn/x97idiU="; hash = "sha256-Q5wZJKP5YgLZQ9lrwE+8W9V7pZCJTLBm6qbjzmYJ9yg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/tools/tfplugindocs/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tfplugindocs"; pname = "tfplugindocs";
version = "0.9.0"; version = "0.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "terraform-plugin-docs"; repo = "terraform-plugin-docs";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1grwbi/nG0d2NwEE/eOeo1+0uGpZ1BRJdubyLwhvKfU="; sha256 = "sha256-0FpzUJDFGKLe88QW+7UI6QPwFMUfqPindOHtGRpOLo8=";
}; };
vendorSha256 = "sha256-VhnPRBVlvR/Xh7wkX7qx0m5s+yBOCJQE1zcAe8//lNw="; vendorSha256 = "sha256-gKRgFfyUahWI+c97uYSCAGNoFy2RPgAw0uYGauEOLt8=";
meta = with lib; { meta = with lib; {
description = "Generate and validate Terraform plugin/provider documentation"; description = "Generate and validate Terraform plugin/provider documentation";

6
pkgs/development/tools/wasm-pack/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasm-pack"; pname = "wasm-pack";
version = "0.10.2"; version = "0.10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rustwasm"; owner = "rustwasm";
repo = "wasm-pack"; repo = "wasm-pack";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nhO/SLeJTq2viDqsJCRNLbgjyDKRli3RWExUNzKT9ug="; sha256 = "sha256-5AhHh/ycoNhhCH30RXvW6MyJkscrjFW+pvudw0MXieU=";
}; };
cargoSha256 = "sha256-6qrCHpg92IRPsf/dK6xcLGX8BLmqox3vgLRqsV4ubsY="; cargoSha256 = "sha256-4TKu9O5jLac5kLZF53DGjxEPize8jZm2B+CurelzSuo=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/misc/screensavers/xssproxy/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xssproxy"; pname = "xssproxy";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "timakro"; owner = "timakro";
repo = "xssproxy"; repo = "xssproxy";
rev = "v${version}"; rev = "v${version}";
sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; sha256 = "sha256-xaFr+AM5GdTZQsN1g8QsXgzsfve9GoteiXHpoMvwEBg=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fwupd-efi"; pname = "fwupd-efi";
version = "1.2"; version = "1.3";
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz";
sha256 = "sha256-aRx38RwhAQSNjauvY8bQ/iLPrQ5dQyIEHJurzrr86z8="; sha256 = "sha256-1Ys04TwhWYZ8ORJgr04kGO6/lI1I36sC6kcrVoP/r1k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

3
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@ -20,7 +20,7 @@ origArgs=("$@")
copyClosureFlags=() copyClosureFlags=()
extraBuildFlags=() extraBuildFlags=()
lockFlags=() lockFlags=()
flakeFlags=() flakeFlags=(--extra-experimental-features 'nix-command flakes')
action= action=
buildNix=1 buildNix=1
fast= fast=
@ -120,7 +120,6 @@ while [ "$#" -gt 0 ]; do
;; ;;
--flake) --flake)
flake="$1" flake="$1"
flakeFlags=(--extra-experimental-features 'nix-command flakes')
shift 1 shift 1
;; ;;
--no-flake) --no-flake)

4
pkgs/os-specific/linux/rdma-core/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rdma-core"; pname = "rdma-core";
version = "40.0"; version = "41.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linux-rdma"; owner = "linux-rdma";
repo = "rdma-core"; repo = "rdma-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "0pcpbri50y5gzrmdqx90wngfd6cfas3m7zlfhz9lqr583fp08vfw"; sha256 = "sha256-D6pgWdJKA6ZL+atFChqSW7hI6/dYfDBRzvb6hu1wxPg=";
}; };
strictDeps = true; strictDeps = true;

6
pkgs/servers/seafile-server/default.nix
View File

@ -10,13 +10,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "seafile-server"; pname = "seafile-server";
version = "8.0.8"; version = "9.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "haiwen"; owner = "haiwen";
repo = "seafile-server"; repo = "seafile-server";
rev = "807867afb7a86f526a6584278914ce9f3f51d1da"; rev = "881c270aa8d99ca6648e7aa1458fc283f38e6f31"; # using a fixed revision because upstream may re-tag releases :/
sha256 = "1nq6dw4xzifbyhxn7yn5398q2sip1p1xwqz6xbis4nzgx4jldd4g"; sha256 = "sha256-M1jIysirtl1KKyEvScOIshLvSa5vjxTdFEARgy8bLTc=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/shells/zsh/zsh-nix-shell/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zsh-nix-shell"; pname = "zsh-nix-shell";
version = "0.4.0"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chisui"; owner = "chisui";
repo = "zsh-nix-shell"; repo = "zsh-nix-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-719lVo6p55G1tt3+6nMhZ904nyvlq0Q5exb0il36/Aw="; sha256 = "sha256-IT3wpfw8zhiNQsrw59lbSWYh0NQ1CUdUtFzRzHlURH0=";
}; };
strictDeps = true; strictDeps = true;

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

@ -6,15 +6,15 @@
buildGoModule rec { buildGoModule rec {
pname = "trivy"; pname = "trivy";
version = "0.30.0"; version = "0.30.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9omVpLpQvCbGr4abbJvMZxLgvOezofhMSyducS0jcf8="; sha256 = "sha256-sdGRZ0ljNnb5esXKqtheHbsEimCbN9JPaY8nNNdQhg4=";
}; };
vendorSha256 = "sha256-6WDoXyZirSKjSNCzm6MPLJLHhjNG7PEFBZBWukiWhXE="; vendorSha256 = "sha256-GJobvLi73Ucpi8iO8vJxiRBFB3/OouZUKhmY/VkQjNY=";
excludedPackages = "misc"; excludedPackages = "misc";

4
pkgs/tools/misc/z-lua/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "z-lua"; pname = "z-lua";
version = "1.8.14"; version = "1.8.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "skywind3000"; owner = "skywind3000";
repo = "z.lua"; repo = "z.lua";
rev = version; rev = version;
sha256 = "sha256-Jy5fcXqXbuJTOAP8vpZjN0qmDR/cVACztcIxl4aXNKs="; sha256 = "sha256-VVJXBVENXlJXVj831Hx4sa7AzGHXpsui6tga9uA6ZnE=";
}; };
dontBuild = true; dontBuild = true;

6
pkgs/tools/networking/checkip/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "checkip"; pname = "checkip";
version = "0.40.0"; version = "0.40.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jreisinger"; owner = "jreisinger";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rq1pmGcRrpqM+ffiWhgAG/L0UqtvD4XWRblzv49P9T8="; sha256 = "sha256-SPfr88ZEIFlbU4ofuxb2I42L7FR4EXbckCVylEQHfN4=";
}; };
vendorSha256 = "sha256-cahrJvPSemlEpaQ1s4bbi1yp0orTDGOoanqXDVVIpjQ="; vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM=";
# Requires network # Requires network
doCheck = false; doCheck = false;

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

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: { lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec { buildGoModule rec {
pname = "kapp"; pname = "kapp";
version = "0.46.0"; version = "0.50.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmware-tanzu"; owner = "vmware-tanzu";
repo = "carvel-kapp"; repo = "carvel-kapp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Z0BjwzTdKHAeETHya6M5OcsIIY//y6dDbbyZe/irCAY="; sha256 = "sha256-rNn3CgqOCHe8rTQGM6SscYhX9rR6MBWRs9xdoOWXPIo=";
}; };
vendorSha256 = null; vendorSha256 = null;

6
pkgs/tools/networking/sish/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "sish"; pname = "sish";
version = "2.1.0"; version = "2.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "antoniomika"; owner = "antoniomika";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-0rUQRul6es+m8JFGXChrygwU5fBi6RiYhoD1dQHpG3s="; sha256 = "sha256-phnPs9mpheIOP0uZZ1Uoo7oRXl09Z+0q54v16YUYNUc=";
}; };
vendorSha256 = "sha256-GoiwpYELleD5tltQgRPGQU725h/uHe8tXqH4tIY//uE="; vendorSha256 = "sha256-Ohdl99h/5epbONaYeGSC02evWcGe+8FtZ53RXHHsMpg=";
meta = with lib; { meta = with lib; {
description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";

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

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "crlfsuite"; pname = "crlfsuite";
version = "2.1.1"; version = "2.1.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nefcore"; owner = "Nefcore";
repo = "CRLFsuite"; repo = "CRLFsuite";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-wWXqeQ6rq4yMG1V9f9JGE91Se8VuU8gpahmYyNTtkmo="; sha256 = "sha256-Olwt19HauTG2HuG4Pro0ImVbQtWqCgx9gV+2RtePT/8=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

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

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "scilla"; pname = "scilla";
version = "1.2.1"; version = "1.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "edoardottt"; owner = "edoardottt";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1gSuKxNpls7B+pSGnGj3k/E93lnj2FPNtAAciPPNAeM="; sha256 = "sha256-1akwc/J1W1zMNqEc2Vv8wdElKbOVJ8uL3XXftGVwWnQ=";
}; };
vendorSha256 = "sha256-gHZj8zpc7yFthCCBM8WGw4WwoW46bdQWe4yWjOkkQE8="; vendorSha256 = "sha256-uTL2qr/LWmdmZipfnbzzzIx6X3fJtB1A9uYekogZN3w=";
meta = with lib; { meta = with lib; {
description = "Information gathering tool for DNS, ports and more"; description = "Information gathering tool for DNS, ports and more";

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

@ -13515,20 +13515,6 @@ with pkgs;
glslang = callPackage ../development/compilers/glslang { }; glslang = callPackage ../development/compilers/glslang { };
go_1_17 = callPackage ../development/compilers/go/1.17.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
# go 1.18 requires a newer Apple SDK to be build. See commit message for more details.
go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Security Foundation;
};
go = go_1_18;
go-junit-report = callPackage ../development/tools/go-junit-report { }; go-junit-report = callPackage ../development/tools/go-junit-report { };
gobang = callPackage ../development/tools/database/gobang { gobang = callPackage ../development/tools/database/gobang {
@ -21904,29 +21890,36 @@ with pkgs;
buildBowerComponents = callPackage ../development/bower-modules/generic { }; buildBowerComponents = callPackage ../development/bower-modules/generic { };
### DEVELOPMENT / GO MODULES ### DEVELOPMENT / GO
# the unversioned attributes should always point to the same go version
go = go_1_18;
buildGoModule = buildGo118Module;
buildGoPackage = buildGo118Package;
go_1_17 = callPackage ../development/compilers/go/1.17.nix ({
inherit (darwin.apple_sdk.frameworks) Foundation Security;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
buildGo117Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_17;
};
buildGo117Package = callPackage ../development/go-packages/generic { buildGo117Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_17; go = buildPackages.go_1_17;
}; };
# go 1.18 requires a newer Apple SDK to be build. See commit message for more details. # requires a newer Apple SDK
buildGo118Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic { go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix {
go = buildPackages.go_1_18; inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
}; };
buildGoPackage = buildGo118Package;
buildGo117Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_17;
};
# go 1.18 requires a newer Apple SDK to be build. See commit message for more details.
buildGo118Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { buildGo118Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic {
go = buildPackages.go_1_18; go = buildPackages.go_1_18;
}; };
buildGo118Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic {
buildGoModule = buildGo118Module; go = buildPackages.go_1_18;
};
go2nix = callPackage ../development/tools/go2nix { }; go2nix = callPackage ../development/tools/go2nix { };