From ca61dff929ea8644ec69c58d3a941e4312a3306f Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 11 Jan 2022 17:26:52 +0100 Subject: [PATCH 1/8] pahole: fix musl build --- pkgs/development/tools/misc/pahole/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index e0100154f3be..1c5364700a05 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib }: +{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }: stdenv.mkDerivation rec { pname = "pahole"; @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ elfutils zlib libbpf ]; + buildInputs = [ elfutils zlib libbpf ] + ++ lib.optional stdenv.hostPlatform.isMusl [ + argp-standalone + musl-obstack + ]; # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ]; From 059f232559b22953f962601cbeaa71f4781de3df Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 29 Jan 2022 21:38:06 +0100 Subject: [PATCH 2/8] wine{Unstable,Staging}: 7.0 -> 7.1 --- pkgs/misc/emulators/wine/sources.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 2c74975fae24..5dcb0295ffed 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,12 +44,18 @@ in rec { ]; }; - unstable = stable; + unstable = fetchurl rec { + # NOTE: Don't forget to change the SHA256 for staging as well. + version = "7.1"; + url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; + sha256 = "sha256-ETwTDu0vMlbJMv+7f0gqBTPtOsXGLJeWIqKm33+fY2o="; + inherit (stable) gecko32 gecko64 mono patches; + }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-2gBfsutKG0ok2ISnnAUhJit7H2TLPDpuP5gvfMVE44o="; + sha256 = "sha256-exMQG/T6ZJggd6S1yN4wyWuNqr6GjjdG4VutGUcqZhE="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 270da0a11582ba036dadc974a8ce51475c529c40 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 31 Jan 2022 23:08:55 +0100 Subject: [PATCH 3/8] nixos/slurm: fix startup of slurmd * make slurmd depend on network target to ensure basic networking is available on startup. This fixes behaviour where slurmd fails with "error: get_addr_info: getaddrinfo() failed". * Use tmpfiles.d to ensure spool directory exists on start up. --- nixos/modules/services/computing/slurm/slurm.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 7686ff99bfc0..8cbe54c60604 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -362,6 +362,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; + requires = [ "network.target" ]; serviceConfig = { Type = "forking"; @@ -371,12 +372,12 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LimitMEMLOCK = "infinity"; }; - - preStart = '' - mkdir -p /var/spool - ''; }; + systemd.tmpfiles.rules = mkIf cfg.client.enable [ + "d /var/spool/slurmd 755 root root -" + ]; + services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true); systemd.services.slurmctld = mkIf (cfg.server.enable) { From 0d562a22d2213fb67d6e7482491e33c0f561c530 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 1 Feb 2022 13:18:26 -0500 Subject: [PATCH 4/8] soft-serve: set meta.mainProgram to "soft" This allows `nix run nixpkgs#soft-serve` to function, as ordinarily it would attempt to run `soft-serve`, which isn't present in the `bin` of the output. --- pkgs/servers/soft-serve/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 5b57ca27049f..3c169d6f1254 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "A tasty, self-hosted Git server for the command line"; homepage = "https://github.com/charmbracelet/soft-serve"; + mainProgram = "soft"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; }; From 572ce73d4a589eb87fe672e654d3880ea97056f7 Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Tue, 1 Feb 2022 22:50:15 +0200 Subject: [PATCH 5/8] maintainers: update yevhenshymotiuk's github and email --- maintainers/maintainer-list.nix | 6 +++--- pkgs/development/python-modules/pipx/default.nix | 2 +- pkgs/development/python-modules/userpath/default.nix | 2 +- pkgs/tools/wayland/wluma/default.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a827855d7e1..93af83034228 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13613,10 +13613,10 @@ github = "nagisa"; githubId = 679122; }; - yevhenshymotiuk = { + yshym = { name = "Yevhen Shymotiuk"; - email = "yevhenshymotiuk@gmail.com"; - github = "yevhenshymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; githubId = 44244245; }; hmenke = { diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 72f0284756af..3f461b15a3f2 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { "Install and Run Python Applications in Isolated Environments"; homepage = "https://github.com/pipxproject/pipx"; license = licenses.mit; - maintainers = with maintainers; [ yevhenshymotiuk ]; + maintainers = with maintainers; [ yshym ]; }; } diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 6ce92e9f3b47..636409f1d967 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Cross-platform tool for adding locations to the user PATH"; homepage = "https://github.com/ofek/userpath"; license = [ licenses.asl20 licenses.mit ]; - maintainers = with maintainers; [ yevhenshymotiuk ]; + maintainers = with maintainers; [ yshym ]; }; } diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/tools/wayland/wluma/default.nix index 837b25d600ff..fd4db1a934ab 100644 --- a/pkgs/tools/wayland/wluma/default.nix +++ b/pkgs/tools/wayland/wluma/default.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { description = "Automatic brightness adjustment based on screen contents and ALS"; homepage = "https://github.com/maximbaz/wluma"; license = licenses.isc; - maintainers = with maintainers; [ yevhenshymotiuk jmc-figueira ]; + maintainers = with maintainers; [ yshym jmc-figueira ]; platforms = platforms.linux; }; } From b17c1821d1c21632606fdea8165b6114a5404a42 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Feb 2022 21:12:06 -0600 Subject: [PATCH 6/8] proot: 5.2.0 -> 5.3.0 (#157582) https://github.com/proot-me/proot/releases/tag/v5.3.0 Drop python patch, PR was merged. --- pkgs/tools/system/proot/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index cf5a845827f4..d11cd8382c9e 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , talloc , pkg-config , libarchive @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; rev = "v${version}"; - sha256 = "1ir3a7rp9rvpv9i8gjrkr383sqadgl7f9nflcrfg7q05bxapwiws"; + sha256 = "sha256-89d1a5QBusra0vd3Ph0lQalXrblBwogi6bNgvvpQL+Q="; }; postPatch = '' @@ -26,13 +26,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3; nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig; - patches = [ - # without this patch the package does not build with python>3.7 - (fetchpatch { - url = "https://github.com/proot-me/proot/pull/285.patch"; - sha256= "1vncq36pr4v0h63fijga6zrwlsb0vb4pj25zxf1ni15ndxv63pxj"; - }) - ]; enableParallelBuilding = true; From e621a3efa4b1712c5ced3133fc35679b4860ef81 Mon Sep 17 00:00:00 2001 From: Binary-Eater Date: Tue, 1 Feb 2022 21:12:29 -0800 Subject: [PATCH 7/8] nvidia-x11: mark legacy_340 as broken if kernel version is greater than 5.4 (#157475) --- pkgs/os-specific/linux/nvidia-x11/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 250ebbb59fdb..ee81876ecafa 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -77,6 +77,7 @@ rec { persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; + broken = with kernel; kernelAtLeast "5.5"; patches = [ ./vm_operations_struct-fault.patch ]; }; } From 3e4412db9c3503b94aab80c9c4d7dbf50e096857 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 2 Feb 2022 05:27:00 +0000 Subject: [PATCH 8/8] hello: 2.10 -> 2.12 (#156591) --- pkgs/applications/misc/hello/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 9f1e89c0df6b..ce49cfd69ca8 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hello"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; + sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; doCheck = true;