ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-08 13:39:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-13 12:02:05 +00:00 committed by GitHub
commit 0b07cb1528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/system/cachix-agent/default.nix
View File

@ -30,7 +30,7 @@ in {
};
host = mkOption {
type = types.str;
type = types.nullOr types.str;
default = null;
description = lib.mdDoc "Cachix uri to use.";
};

2
nixos/modules/system/boot/systemd.nix
View File

@ -121,7 +121,7 @@ let
"final.target"
"kexec.target"
"systemd-kexec.service"
"systemd-update-utmp.service"
] ++ lib.optional (cfg.package.withUtmp or true) "systemd-update-utmp.service" ++ [
# Password entry.
"systemd-ask-password-console.path"

4
pkgs/applications/editors/o/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "o";
version = "2.55.1";
version = "2.56.0";
src = fetchFromGitHub {
owner = "xyproto";
repo = "o";
rev = "v${version}";
hash = "sha256-owueLd6kR/bDFxKI9QOUgriH63XRsEEpIFfp5aRTSbI=";
hash = "sha256-mUd2IfTSmpRIurhQy2BI8KAuQyYmBoqpvPnEvnFRc7Y=";
};
postPatch = ''

4
pkgs/applications/misc/nwg-panel/default.nix
View File

@ -14,13 +14,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.7.4";
version = "0.7.8";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
sha256 = "sha256-L5oVuoEU8DEhRttFeas5cCA0XPo5sCm1D+JUAWzZdYA=";
sha256 = "sha256-dRYM6alxvhaVTRJPZ/minnEDXrijk8SX2C6/EYhhpEA=";
};
# No tests

1
pkgs/applications/misc/octoprint/default.nix
View File

@ -168,6 +168,7 @@ let
"zeroconf"
"Flask-Login"
"werkzeug"
"flask"
];
in
''

6
pkgs/applications/misc/remarkable/rmview/default.nix
View File

@ -12,12 +12,16 @@ python3Packages.buildPythonApplication rec {
};
nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted pyjwt pyopenssl service-identity ];
propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted pyjwt pyopenssl service-identity sshtunnel ];
preBuild = ''
pyrcc5 -o src/rmview/resources.py resources.qrc
'';
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with lib; {
description = "Fast live viewer for reMarkable 1 and 2";
homepage = "https://github.com/bordaigorl/rmview";

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

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "k0sctl";
version = "0.13.2";
version = "0.14.0";
src = fetchFromGitHub {
owner = "k0sproject";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uKN+vH7BGz8lUDrmPeLp941KPkkTfOkK4Ib9GZR9D0M=";
sha256 = "sha256-m0BdmsqmkB3Q6JzzRPS6Tq68a33heUifY2EgTjbAm3M=";
};
vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8=";

5
pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix
View File

@ -45,6 +45,11 @@ in stdenv.mkDerivation rec {
runHook preConfigure
export HOME=$PWD/tmp
# with the update of openssl3, some key ciphers are not supported anymore
# this flag will allow those codecs again as a workaround
# see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
# and https://github.com/vector-im/element-web/issues/21043
export NODE_OPTIONS=--openssl-legacy-provider
mkdir -p $HOME
pushd element-web

6
pkgs/applications/science/logic/elan/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "elan";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "leanprover";
repo = "elan";
rev = "v${version}";
sha256 = "sha256-jHECNSXSATLuNHNSVwi7mBTI8l6+cLPDISc5T/4yHDg=";
sha256 = "1aq06d66y622n0bbd57dx8s0ajz6cdv1vzaz25wvi4i62sg4x21x";
};
cargoSha256 = "sha256-/XwlTmUboDbB6RTanhKyO6o2GBUhxpH/NQjeNsKpse0=";
cargoSha256 = "sha256-RzeewQzsV5F5E0xwJF1MpzzQ8usyfQjzlDInOJqZdO8=";
nativeBuildInputs = [ pkg-config makeWrapper ];

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "22.09.04";
version = "22.09.12";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-eRBso0oeL+EkOw6oINbuf9s07BtKc8132FK5QbAeA8s=";
sha256 = "sha256-W8hk6UniK4HDJPtMaRQzhfvmE2uZhz4J0QMIbSrtJFo=";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/data/icons/numix-icon-theme-square/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "22.09.04";
version = "22.09.12";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-BzwuaWaSBVIh9Vk3Y7uv0+9aivXNFhBGJJMoDPrpKh4=";
sha256 = "sha256-cwdP7vY7sXYhBbMpSvfDuuNZBalddmP5XEYMYmpYeoc=";
};
nativeBuildInputs = [ gtk3 ];

1
pkgs/development/compilers/llvm/14/llvm/default.nix
View File

@ -155,6 +155,7 @@ in stdenv.mkDerivation (rec {
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
"-DLLVM_BUILD_STATIC=ON"
"-DLLVM_LINK_LLVM_DYLIB=off"
# libxml2 needs to be disabled because the LLVM build system ignores its .la
# file and doesn't link zlib as well.
# https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcifpp";
version = "4.2.0";
version = "4.2.2";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = pname;
rev = "v${version}";
sha256 = "1hzi6fgbsmy8h8nfwkyfds9jz13nqw72h0x81jqw5516kkvar5iw";
sha256 = "0mhplcpni4p8lavrq4fz9qq8mbxhvpnlxzy55yrz8y07d76ajg6y";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/libpsl/default.nix
View File

@ -18,7 +18,11 @@ let
enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
# Apparently valgrind doesn't support some new ARM features on (some) Hydra machines:
# VEX: Mismatch detected between RDMA and atomics features.
&& !stdenv.isAarch64;
&& !stdenv.isAarch64
# Valgrind on musl does not hook malloc calls properly, resulting in errors `Invalid free() / delete / delete[] / realloc()`
# https://bugs.kde.org/show_bug.cgi?id=435441
&& !stdenv.hostPlatform.isMusl
;
in stdenv.mkDerivation rec {
pname = "libpsl";
version = "0.21.1";

4
pkgs/development/misc/brev-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.95";
version = "0.6.102";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "09qhc38ycqs6vdyy1rxaxbihq0q59g2ffkmmlk6ipdlv2b3ywz0f";
sha256 = "sha256-QXYcLy8k1s2/kVwgnMnsJemkewCQzm8NJq7GcBD06vE=";
};
vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.6";
version = "0.8.7";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FJtp4g4kIkXFYvYcM9yF3BY6tgHmip11/oIyMSfTwqM=";
sha256 = "sha256-cSgsEjOnaFUuf9Vf6UOCC7LsmVg47wEQKU0LxpngLYc=";
};
vendorSha256 = "sha256-s+Cc7pG/GLK0ZhXX/wK7jMNcDIeu/Am2vCgzrNXKpdw=";
vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";
ldflags = [
"-s"

4
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "9.0.0";
version = "9.1.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0f7rA/GxXgIeJ9hh/g+MpAPdPW8NzaVKLApYyrhlIVM=";
sha256 = "sha256-waqEXmKGxGgAjJ+USsK/sfLSJV3XPAhkdXCqb45Gs+M=";
};
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2022-08-22";
cargoSha256 = "sha256-A1oH2He1nEmVmBBTfMsZpJNKNtIQpmNx3AE56e9Z1qk=";
version = "2022-09-12";
cargoSha256 = "sha256-mi6Ab3CyOfz1ZYViYbJwJCIew/N+IPt37bkq7x/N7IY=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-G/IElEE6eetQcLpESXCQtuYED/uTrsdeZj8fkqC3FSM=";
sha256 = "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8=";
};
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

2
pkgs/games/angband/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://angband.github.io/angband";
description = "A single-player roguelike dungeon exploration game";
maintainers = [ ];
maintainers = [ maintainers.kenran ];
license = licenses.gpl2;
};
}

4
pkgs/games/fheroes2/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "fheroes2";
version = "0.9.18";
version = "0.9.19";
src = fetchFromGitHub {
owner = "ihhub";
repo = "fheroes2";
rev = version;
sha256 = "sha256-I79PoNE6GFvYD4jnsxKo7MsoPgVow8b8fTIiClOGnAI=";
sha256 = "sha256-GLF5OXPEc1V1r9INbEdIM17tm7pKq1ZuOuShtAnqXjM=";
};
buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

6
pkgs/os-specific/linux/systemd/default.nix
View File

@ -100,6 +100,7 @@
, withTimesyncd ? true
, withTpm2Tss ? !stdenv.hostPlatform.isMusl
, withUserDb ? !stdenv.hostPlatform.isMusl
, withUtmp ? !stdenv.hostPlatform.isMusl
# tests assume too much system access for them to be feasible for us right now
, withTests ? false
@ -502,9 +503,10 @@ stdenv.mkDerivation {
"-Dbpf-framework=true"
] ++ lib.optionals withTpm2Tss [
"-Dtpm2=true"
] ++ lib.optionals (!withUtmp) [
"-Dutmp=false"
] ++ lib.optionals stdenv.hostPlatform.isMusl [
"-Dgshadow=false"
"-Dutmp=false"
"-Didn=false"
];
preConfigure =
@ -683,7 +685,7 @@ stdenv.mkDerivation {
# runtime; otherwise we can't and we need to reboot.
interfaceVersion = 2;
inherit withCryptsetup withHostnamed withImportd withLocaled withMachined withTimedated util-linux kmod kbd;
inherit withCryptsetup withHostnamed withImportd withLocaled withMachined withTimedated withUtmp util-linux kmod kbd;
tests = {
inherit (nixosTests) switchTest;

4
pkgs/servers/sql/postgresql/ext/postgis.nix
View File

@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
version = "3.3.0";
version = "3.3.1";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
sha256 = "sha256-aWe3f3yKcjqHa+wmWPgqbLfytt3/sEgKsG0zcnivYFU=";
sha256 = "sha256-kb6ACnLXSMWjpKANgqwd5CAj4p2mHs5uv5x3/iKPyxo=";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

6
pkgs/tools/admin/cf-vault/default.nix
View File

@ -1,16 +1,16 @@
{buildGoModule, fetchFromGitHub, lib}:
buildGoModule rec {
pname = "cf-vault";
version = "0.0.11";
version = "0.0.13";
src = fetchFromGitHub {
owner = "jacobbednarz";
repo = pname;
rev = version;
sha256 = "sha256-Imd9qeT4xg5ujVPLHSSqoteSPl9t97q3Oc4C/vzHphg=";
sha256 = "sha256-wW/CSF+DexrdmOvp3BpyBmltOyF4TBTW3OXwjdqfaR4=";
};
vendorSha256 = "sha256-PkmbVg5HnsUaSL/Kp3YJVdyzpjgvr/p9mKNmOubwXQA=";
vendorSha256 = "sha256-H44YCoay/dVL22YhMy2AT/Jageu0pM9IS0SWPp9E4F8=";
meta = with lib; {
description = ''

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

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "rnp";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "rnp";
rev = "v${version}";
sha256 = "u0etVslTBF9fBqnpVBofYsm0uC/eR6gO3lhwzqua5Qw=";
sha256 = "sha256-EpmQ9dCbc46OEbWJy/9wi/WKAZ14azCojpS5k6Awx6w=";
};
# in master post 0.16.0, see https://github.com/rnpgp/rnp/issues/1835