b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-09-16 00:02:05 +00:00 committed by GitHub
parent 3a2b245d48 c8c8da51f8
commit 6a10b23c61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 159 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -462,6 +462,12 @@
githubId = 2335822;
name = "Alexandre Esteves";
};
alexnortung = {
name = "alexnortung";
email = "alex_nortung@live.dk";
github = "alexnortung";
githubId = 1552267;
};
alexvorobiev = {
email = "alexander.vorobiev@gmail.com";
github = "alexvorobiev";

28
nixos/modules/security/lock-kernel-modules.nix
View file

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, pkgs, lib, ... }:
with lib;
@ -13,7 +13,7 @@ with lib;
default = false;
description = ''
Disable kernel module loading once the system is fully initialised.
Module loading is disabled until the next reboot. Problems caused
Module loading is disabled until the next reboot. Problems caused
by delayed module loading can be fixed by adding the module(s) in
question to <option>boot.kernelModules</option>.
'';
@ -29,20 +29,30 @@ with lib;
else [ x.fsType ]
else []) config.system.build.fileSystems;
systemd.services.disable-kernel-module-loading = rec {
systemd.services.disable-kernel-module-loading = {
description = "Disable kernel module loading";
wants = [ "systemd-udevd.service" ];
wantedBy = [ config.systemd.defaultUnit ];
after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy;
before = [ config.systemd.defaultUnit ];
after =
[ "firewall.service"
"systemd-modules-load.service"
];
unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel";
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "/bin/sh -c 'echo -n 1 >/proc/sys/kernel/modules_disabled'";
};
serviceConfig =
{ Type = "oneshot";
RemainAfterExit = true;
TimeoutSec = 180;
};
script = ''
${pkgs.udev}/bin/udevadm settle
echo -n 1 >/proc/sys/kernel/modules_disabled
'';
};
};
}

17
nixos/modules/system/boot/tmp.nix
View file

@ -2,6 +2,9 @@
with lib;
let
cfg = config.boot;
in
{
###### interface
@ -24,18 +27,28 @@ with lib;
'';
};
boot.tmpOnTmpfsSize = mkOption {
type = types.oneOf [ types.str types.types.ints.positive ];
default = "50%";
description = ''
Size of tmpfs in percentage.
Percentage is defined by systemd.
'';
};
};
###### implementation
config = {
systemd.mounts = mkIf config.boot.tmpOnTmpfs [
# When changing remember to update /tmp mount in virtualisation/qemu-vm.nix
systemd.mounts = mkIf cfg.tmpOnTmpfs [
{
what = "tmpfs";
where = "/tmp";
type = "tmpfs";
mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ];
mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ];
}
];

2
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -686,7 +686,7 @@ in
fsType = "tmpfs";
neededForBoot = true;
# Sync with systemd's tmp.mount;
options = [ "mode=1777" "strictatime" "nosuid" "nodev" ];
options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ];
};
"/tmp/xchg" =
{ device = "xchg";

4
pkgs/applications/audio/pt2-clone/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
version = "1.32";
version = "1.33";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
sha256 = "sha256-U1q4xCOzV7n31WgCTGlEXvZaUT/TP797cOAHkecQaLo=";
sha256 = "sha256-XPQRFbIgSU3oCTbLe4gYkMNBvcLZdJvU/YQHtUvgt9k=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/applications/misc/cobalt/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cobalt";
version = "0.17.0";
version = "0.17.4";
src = fetchFromGitHub {
owner = "cobalt-org";
repo = "cobalt.rs";
rev = "v${version}";
sha256 = "sha256-IeO50/f+DX9ujZy1+cU1j+nnSl3lpf/nPOu5YBGcCSc=";
sha256 = "sha256-uZcs3VkmpasFwgB7m1spTHi2W86tJt2kWlRTXAotvvo=";
};
cargoSha256 = "sha256-ECgCxR5nsHCeQ3Qc7GWm/lMbmtU2fbAF42nrn2LEcyw=";
cargoSha256 = "sha256-U2TVg2/SIOxaWs4EehTpcu47uDO/EA2dJK56k3I6F+0=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

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

@ -2,13 +2,13 @@
xmrig.overrideAttrs (oldAttrs: rec {
pname = "xmrig-mo";
version = "6.14.1-mo2";
version = "6.15.0-mo1";
src = fetchFromGitHub {
owner = "MoneroOcean";
repo = "xmrig";
rev = "v${version}";
sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No=";
sha256 = "sha256-2JT315JbjiU8gAwROZL820MYC/v3MPtJVsN+vsf4KDQ=";
};
meta = with lib; {

23
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib
, fetchurl
, appimageTools
}:
let
version = "1.7.1";
in
appimageTools.wrapType2 {
name = "session-desktop-appimage-${version}";
src = fetchurl {
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6";
};
meta = with lib; {
description = "Onion routing based messenger";
homepage = "https://getsession.org/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ alexnortung ];
platforms = [ "x86_64-linux" ];
};
}

1
pkgs/build-support/alternatives/blas/default.nix
View file

@ -31,7 +31,6 @@ let
else stdenv.hostPlatform.extensions.sharedLibrary;
isILP64 = blasProvider.blas64 or false;
blasImplementation = lib.getName blasProvider;
in

8
pkgs/development/compilers/mit-scheme/default.nix
View file

@ -62,10 +62,10 @@ stdenv.mkDerivation {
runHook postInstall
'';
postFixup =
'' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}
'';
postFixup = ''
wrapProgram $out/bin/mit-scheme${arch}-${version} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}-${version}
'';
nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ];

4
pkgs/development/libraries/opencolorio/default.nix
View file

@ -16,13 +16,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "opencolorio";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenColorIO";
rev = "v${version}";
sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487";
sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA=";
};
nativeBuildInputs = [ cmake ];

32
pkgs/development/python-modules/migen/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, colorama
}:
buildPythonPackage rec {
pname = "migen";
version = "unstable-2021-09-14";
disabled = pythonOlder "3.3";
src = fetchFromGitHub {
owner = "m-labs";
repo = "migen";
rev = "a5bc262560238f93ceaad423820eb06843326274";
sha256 = "32UjaIam/B7Gx6XbPcR067LcXfokJH2mATG9mU38a6o=";
};
propagatedBuildInputs = [
colorama
];
pythonImportsCheck = [ "migen" ];
meta = with lib; {
description = " A Python toolbox for building complex digital hardware";
homepage = "https://m-labs.hk/migen";
license = licenses.bsd2;
maintainers = with maintainers; [ l-as ];
};
}

4
pkgs/development/python-modules/pynanoleaf/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynanoleaf";
version = "0.1.0";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BiLJgsey7kIIeN5+CKKnrTB2bSKMNEbeMLwGi2LRLcg=";
sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7";
};
disabled = !isPy3k;

4
pkgs/development/tools/misc/strace/default.nix
View file

@ -14,9 +14,7 @@ stdenv.mkDerivation rec {
# On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace.
# The build will silently fall back and -k will not work on RISC-V.
buildInputs = [ perl.out libunwind ]; # support -k
postPatch = "patchShebangs --host strace-graph";
buildInputs = [ libunwind ]; # support -k
configureFlags = [ "--enable-mpers=check" ];

16
pkgs/games/multimc/0001-pick-latest-java-first.patch
View file

@ -4,14 +4,14 @@ Date: Tue, 22 Jun 2021 21:50:11 +0300
Subject: [PATCH] pick latest java first
---
api/logic/java/JavaInstallList.cpp | 4 ++--
api/logic/java/JavaUtils.cpp | 2 +-
launcher/java/JavaInstallList.cpp | 4 ++--
launcher/java/JavaUtils.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
index 0bded03c..40898e20 100644
--- a/api/logic/java/JavaInstallList.cpp
+++ b/api/logic/java/JavaInstallList.cpp
--- a/launcher/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
@ -23,10 +23,10 @@ index 0bded03c..40898e20 100644
return (*rleft) > (*rright);
}
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 5f004a10..6d633631 100644
--- a/api/logic/java/JavaUtils.cpp
+++ b/api/logic/java/JavaUtils.cpp
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths()
qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";

18
pkgs/games/multimc/default.nix
View file

@ -1,15 +1,15 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }:
{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }:
let
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
in mkDerivation rec {
pname = "multimc";
version = "unstable-2021-06-21";
version = "unstable-2021-09-08";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = "8179a89103833805d5374399d80a4305be1b8355";
sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8=";
rev = "e2355eb276bf355ca4acf526a0f3cc390aa88f8b";
sha256 = "3G9QPoAbC+uVfUYR0Kq6hnxl9c2mvCzIEYGjwfarQJ8=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];
@ -19,16 +19,20 @@ in mkDerivation rec {
postPatch = ''
# hardcode jdk paths
substituteInPlace api/logic/java/JavaUtils.cpp \
substituteInPlace launcher/java/JavaUtils.cpp \
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
--replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
# add client ID
substituteInPlace notsecrets/Secrets.cpp \
--replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";'
'';
cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ];
postInstall = ''
install -Dm644 ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg
install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
install -Dm644 ../launcher/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg
install -Dm755 ../launcher/package/linux/multimc.desktop $out/share/applications/multimc.desktop
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
wrapProgram $out/bin/multimc \

6
pkgs/games/rpg-cli/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rpg-cli";
version = "0.6.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "facundoolano";
repo = pname;
rev = version;
sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw=";
sha256 = "sha256-Ih+1qO/VHkRp766WDe09xXL/pkby+sURopy7m5wRn4Y=";
};
cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g=";
cargoSha256 = "sha256-Au7Nlpl4XOSG8rW0DaHFDqBr1kUY5Emyw6ff0htPc+I=";
# tests assume the authors macbook, and thus fail
doCheck = false;

6
pkgs/shells/nushell/default.nix
View file

@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.36.0";
version = "0.37.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU=";
sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E=";
};
cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY=";
cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];

4
pkgs/tools/admin/exoscale-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.40.5";
version = "1.41.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-OKGbTkX3HNMYd5UT6l2uqExVZ0TOw0soB3dhebzm2Kg=";
sha256 = "sha256-0utKBCe65lCaamoF4uqvku1zTX2QPpV/6xBtpGteVYw=";
};
goPackagePath = "github.com/exoscale/cli";

6
pkgs/tools/misc/macchina/default.nix
View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw";
sha256 = "sha256-eZeS3lS/eKGvS7CoCnwhkX7jSwAqZOKLMWvLfZPzGtA=";
};
cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60";
cargoSha256 = "sha256-Ix+Zj5qj1So8Urobw+78yCdRAerFkPctIkousk266DU=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

11
pkgs/tools/misc/miniserve/default.nix
View file

@ -11,21 +11,24 @@
rustPlatform.buildRustPackage rec {
pname = "miniserve";
version = "0.15.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg=";
sha256 = "sha256-DqH/6Uu4L0fWbnGX8s3jCGwBgPE2PLIkS/dZIj+BA9Q=";
};
cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ=";
cargoSha256 = "sha256-LgdVO41e56DIRkky1aF0X80ixs7ZH93Qk9Yx67vkO9E=";
nativeBuildInputs = [ installShellFiles pkg-config zlib ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [ "--skip=cant_navigate_up_the_root" ];
checkFlags = [
"--skip=bind_ipv4_ipv6::case_2"
"--skip=cant_navigate_up_the_root"
];
postInstall = ''
installShellCompletion --cmd miniserve \

6
pkgs/tools/networking/sniffglue/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sniffglue";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UZLVkTkuJPzju9fl4N6Lgdn3gNBpKruNFxDcoTwdtYc=";
sha256 = "sha256-P8ubw523sw1O6Gpruy1Wa/Y0I3qJgvMdT53wBBoEGhE=";
};
cargoSha256 = "sha256-bHwp0U83uvhFOi9oaeVwNrqHkxK2IQs/bvxqUl/rpjI=";
cargoSha256 = "sha256-+Wh+/C9LvYppCghv11e8NKNhiMy0SV4S3nEWA6b1hQk=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/tools/networking/tendermint/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tendermint";
version = "0.34.12";
version = "0.34.13";
src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY=";
sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY=";
};
vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI=";
vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM=";
subPackages = [ "cmd/tendermint" ];

2
pkgs/top-level/all-packages.nix
View file

@ -22748,6 +22748,8 @@ with pkgs;
seshat = callPackage ../data/fonts/seshat { };
session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { };
shaderc = callPackage ../development/compilers/shaderc { };
shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };

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

@ -4568,6 +4568,8 @@ in {
mido = callPackage ../development/python-modules/mido { };
migen = callPackage ../development/python-modules/migen { };
milc = callPackage ../development/python-modules/milc { };
milksnake = callPackage ../development/python-modules/milksnake { };