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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-08 18:02:11 +00:00 committed by GitHub
commit 67f5b5a85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 95 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/web-apps/snipe-it.nix
View File

@ -472,6 +472,7 @@ in {
"d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -"
"d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -"
"d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -"
"d ${cfg.dataDir}/storage/private_uploads 0700 ${user} ${group} - -"
];
users = {

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -188,7 +188,7 @@ in
runUsingSystemd = mkOption {
description = lib.mdDoc "Use systemd to manage the Plasma session";
type = types.bool;
default = false;
default = true;
};
excludePackages = mkOption {

31
pkgs/applications/editors/zee/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }:
rustPlatform.buildRustPackage rec {
pname = "zee";
version = "0.3.2";
src = fetchFromGitHub {
owner = "zee-editor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
# disable downloading and building the tree-sitter grammars at build time
# grammars can be configured in a config file and installed with `zee --build`
# see https://github.com/zee-editor/zee#syntax-highlighting
ZEE_DISABLE_GRAMMAR_BUILD=1;
cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c=";
meta = with lib; {
description = "A modern text editor for the terminal written in Rust";
homepage = "https://github.com/zee-editor/zee";
license = licenses.mit;
maintainers = with maintainers; [ booklearner ];
};
}

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

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

6
pkgs/applications/terminal-emulators/wezterm/default.nix
View File

@ -29,14 +29,14 @@
rustPlatform.buildRustPackage rec {
pname = "wezterm";
version = "20220624-141144-bd1b7c5d";
version = "20220807-113146-c2fee766";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw=";
sha256 = "sha256-2krngcANqcwq8wNQZSz01srJ6yEOkk03QnO2sL7SuJA=";
};
postPatch = ''
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
rm -r wezterm-ssh/tests
'';
cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU=";
cargoSha256 = "sha256-ZkDGCR86VSCuvVlo4Pf9Ifax2BZuBicZpB/K/7bIMls=";
nativeBuildInputs = [
pkg-config

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -482,7 +482,7 @@ stdenv.mkDerivation {
hardening_unsupported_flags+=" stackprotector fortify"
'' + optionalString targetPlatform.isAvr ''
hardening_unsupported_flags+=" stackprotector pic"
'' + optionalString (targetPlatform.libc == "newlib") ''
'' + optionalString (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") ''
hardening_unsupported_flags+=" stackprotector fortify pie pic"
'' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) ''
hardening_unsupported_flags+=" stackprotector"

4
pkgs/data/misc/v2ray-domain-list-community/default.nix
View File

@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20220708161253";
version = "20220808014309";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s=";
sha256 = "sha256-pqe6AjXDTN71tShD41/tQFljRiH7qJaZ8w5lcTs6dxk=";
};
vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo=";
meta = with lib; {

6
pkgs/data/misc/v2ray-geoip/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202207070057";
version = "202208040058";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77";
sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk=";
rev = "97174fe0eeb28838b0e5e805687d230df773e661";
sha256 = "sha256-hodJ4HQHbv9voSS847pAHd3YSmfkV7fKyJhEUApVN+w=";
};
installPhase = ''

2
pkgs/development/compilers/gcc/common/configure-flags.nix
View File

@ -97,7 +97,7 @@ let
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib"
++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
);

6
pkgs/development/compilers/unison/default.nix
View File

@ -6,18 +6,18 @@
stdenv.mkDerivation rec {
pname = "unison-code-manager";
milestone_id = "M3";
milestone_id = "M4";
version = "1.0.${milestone_id}-alpha";
src = if (stdenv.isDarwin) then
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
sha256 = "sha256-xshqqERBr60vz1qEnewlgNIvd24aE6/VtK5iBlanQHg=";
sha256 = "A8i1jH9+W89M+XbmYx0knJsP5c/EdVE2T9L/EIL0USU=";
}
else
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
sha256 = "sha256-rt8Y1ZEQVHH6gk4JV3lH38H10TDwdLDnbnqjG2vyyy4=";
sha256 = "OqtJiKAsefw2fVjhtsYUe+qLPqXBPFkHUaMh26EJBJ4=";
};
# The tarball is just the prebuilt binary, in the archive root.

1
pkgs/development/python-modules/eventlet/default.nix
View File

@ -51,6 +51,7 @@ buildPythonPackage rec {
disabledTests = [
# Tests requires network access
"test_017_ssl_zeroreturnerror"
"test_018b_http_10_keepalive_framing"
"test_getaddrinfo"
"test_hosts_no_network"
"test_leakage_from_tracebacks"

1
pkgs/development/python-modules/uvloop/default.nix
View File

@ -48,7 +48,6 @@ buildPythonPackage rec {
# Depend on pyopenssl
"--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown"
"--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation"
] ++ lib.optionals stdenv.hostPlatform.isAarch [
# test gets stuck in epoll_pwait on hydras aarch64 builders
# https://github.com/MagicStack/uvloop/issues/412
"--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"

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

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkg-config, python3Packages, which, procps, gdb, capnproto }:
stdenv.mkDerivation rec {
version = "5.5.0";
version = "5.6.0";
pname = "rr";
src = fetchFromGitHub {
owner = "mozilla";
repo = "rr";
rev = version;
sha256 = "sha256-ZZhkmDWGNWejwXZEcFO9p9NG1dopK7kXRj7OrkJCPR0=";
sha256 = "H39HPkAQGubXVQV3jCpH4Pz+7Q9n03PrS70utk7Tt2k=";
};
postPatch = ''

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kics";
version = "1.5.12";
version = "1.5.13";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
sha256 = "sha256-jHspStyjq5T9jzYDRYaf2gOI4F/X+h4nDn0PFUOHoBY=";
sha256 = "sha256-+trrtcK0zIjgl8SzURbvaabB/RtDKMEYyU8ZttD0hOs=";
};
vendorSha256 = "sha256-q5NuuP04kOoLVj210s17fIW2cxrsC/tAyET8YYGai0M=";
vendorSha256 = "sha256-/hoyT/PJ/nEQFg/1CJTb4lwOQ8ZYZtuHQeQUpPZepvc=";
subPackages = [ "cmd/console" ];

31
pkgs/tools/misc/outils/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, lib }:
stdenv.mkDerivation rec {
pname = "outils";
version = "0.10";
src = fetchFromGitHub {
owner = "leahneukirchen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs=";
};
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://github.com/leahneukirchen/outils";
description = "Port of OpenBSD-exclusive tools such as `calendar`, `vis`, and `signify`";
license = with licenses; [
beerware
bsd2
bsd3
bsdOriginal
isc
mit
publicDomain
];
platforms = platforms.linux;
maintainers = with maintainers; [ somasis ];
};
}

4
pkgs/tools/package-management/opkg/default.nix
View File

@ -2,11 +2,11 @@
, autoreconfHook }:
stdenv.mkDerivation rec {
version = "0.4.5";
version = "0.6.0";
pname = "opkg";
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
sha256 = "sha256-oSFKdfo0+5Io242kcwjg5xGxyT/Yk4zxZMEP0o61Dx4=";
sha256 = "sha256-VoRHIu/yN9rxSqbmgUNvMkUhPFWQ7QzaN6ed9jf/Okw=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

5
pkgs/tools/typesetting/sile/default.nix
View File

@ -33,7 +33,6 @@ let
luasocket
luautf8
penlight
stdlib
vstruct
] ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
bit32
@ -44,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.13.3";
version = "0.14.1";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0x8w63xr3nd0is1pv55dlgnv7fkn8s5ny6453wn84h44i7qwdc8s";
sha256 = "1l0cl5rwpndn2zmcrydnd80cznpfr8m6v3s4qkx6n6q0lrcnxa56";
};
configureFlags = [

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

@ -5848,6 +5848,10 @@ with pkgs;
zabbixctl = callPackage ../tools/misc/zabbixctl { };
zee = callPackage ../applications/editors/zee {
inherit (darwin.apple_sdk.frameworks) Security;
};
zeek = callPackage ../applications/networking/ids/zeek { };
zoekt = callPackage ../tools/text/zoekt { };
@ -10029,6 +10033,8 @@ with pkgs;
ouch = callPackage ../tools/compression/ouch { };
outils = callPackage ../tools/misc/outils {};
mpi = openmpi; # this attribute should used to build MPI applications
ucx = callPackage ../development/libraries/ucx {};