git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit930984c1de1ffcf7bdca11035d8fe1dca3414492 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateWed 2 Feb 2022, 06:01 (5 years ago) parentd05ca00cb78e66
11 files changed+32−26
compare with master
unifiedsplit
maintainers/maintainer-list.nix+3−3 nixos/modules/services/computing/slurm/slurm.nix+5−4 pkgs/applications/misc/hello/default.nix+2−2 pkgs/development/python-modules/pipx/default.nix+1−1 pkgs/development/python-modules/userpath/default.nix+1−1 pkgs/development/tools/misc/pahole/default.nix+6−2 pkgs/misc/emulators/wine/sources.nix+8−2 pkgs/os-specific/linux/nvidia-x11/default.nix+1 pkgs/servers/soft-serve/default.nix+1 pkgs/tools/system/proot/default.nix+3−10 pkgs/tools/wayland/wluma/default.nix+1−1
maintainers/maintainer-list.nix+3−3
@@ -13620,10 +13620,10 @@
1362013620 github = "nagisa";
1362113621 githubId = 679122;
1362213622 };
13623− yevhenshymotiuk = {
13623+ yshym = {
1362413624 name = "Yevhen Shymotiuk";
13625− email = "yevhenshymotiuk@gmail.com";
13626− github = "yevhenshymotiuk";
13625+ email = "yshym@pm.me";
13626+ github = "yshym";
1362713627 githubId = 44244245;
1362813628 };
1362913629 hmenke = {
nixos/modules/services/computing/slurm/slurm.nix+5−4
@@ -362,6 +362,7 @@ in
362362
363363 wantedBy = [ "multi-user.target" ];
364364 after = [ "systemd-tmpfiles-clean.service" ];
365+ requires = [ "network.target" ];
365366
366367 serviceConfig = {
367368 Type = "forking";
@@ -371,12 +372,12 @@ in
371372 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
372373 LimitMEMLOCK = "infinity";
373374 };
374−
375− preStart = ''
376− mkdir -p /var/spool
377− '';
378375 };
379376
377+ systemd.tmpfiles.rules = mkIf cfg.client.enable [
378+ "d /var/spool/slurmd 755 root root -"
379+ ];
380+
380381 services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true);
381382
382383 systemd.services.slurmctld = mkIf (cfg.server.enable) {
pkgs/applications/misc/hello/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "hello";
12− version = "2.10";
12+ version = "2.12";
1313
1414 src = fetchurl {
1515 url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
16− sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
16+ sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";
1717 };
1818
1919 doCheck = true;
pkgs/development/python-modules/pipx/default.nix+1−1
@@ -68,6 +68,6 @@ buildPythonPackage rec {
6868 "Install and Run Python Applications in Isolated Environments";
6969 homepage = "https://github.com/pipxproject/pipx";
7070 license = licenses.mit;
71− maintainers = with maintainers; [ yevhenshymotiuk ];
71+ maintainers = with maintainers; [ yshym ];
7272 };
7373}
pkgs/development/python-modules/userpath/default.nix+1−1
@@ -24,6 +24,6 @@ buildPythonPackage rec {
2424 description = "Cross-platform tool for adding locations to the user PATH";
2525 homepage = "https://github.com/ofek/userpath";
2626 license = [ licenses.asl20 licenses.mit ];
27− maintainers = with maintainers; [ yevhenshymotiuk ];
27+ maintainers = with maintainers; [ yshym ];
2828 };
2929}
pkgs/development/tools/misc/pahole/default.nix+6−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib }:
1+{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }:
22
33stdenv.mkDerivation rec {
44 pname = "pahole";
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ cmake pkg-config ];
13− buildInputs = [ elfutils zlib libbpf ];
13+ buildInputs = [ elfutils zlib libbpf ]
14+ ++ lib.optional stdenv.hostPlatform.isMusl [
15+ argp-standalone
16+ musl-obstack
17+ ];
1418
1519 # Put libraries in "lib" subdirectory, not top level of $out
1620 cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];
pkgs/misc/emulators/wine/sources.nix+8−2
@@ -44,12 +44,18 @@ in rec {
4444 ];
4545 };
4646
47− unstable = stable;
47+ unstable = fetchurl rec {
48+ # NOTE: Don't forget to change the SHA256 for staging as well.
49+ version = "7.1";
50+ url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
51+ sha256 = "sha256-ETwTDu0vMlbJMv+7f0gqBTPtOsXGLJeWIqKm33+fY2o=";
52+ inherit (stable) gecko32 gecko64 mono patches;
53+ };
4854
4955 staging = fetchFromGitHub rec {
5056 # https://github.com/wine-staging/wine-staging/releases
5157 inherit (unstable) version;
52− sha256 = "sha256-2gBfsutKG0ok2ISnnAUhJit7H2TLPDpuP5gvfMVE44o=";
58+ sha256 = "sha256-exMQG/T6ZJggd6S1yN4wyWuNqr6GjjdG4VutGUcqZhE=";
5359 owner = "wine-staging";
5460 repo = "wine-staging";
5561 rev = "v${version}";
pkgs/os-specific/linux/nvidia-x11/default.nix+1
@@ -77,6 +77,7 @@ rec {
7777 persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn";
7878 useGLVND = false;
7979
80+ broken = with kernel; kernelAtLeast "5.5";
8081 patches = [ ./vm_operations_struct-fault.patch ];
8182 };
8283}
pkgs/servers/soft-serve/default.nix+1
@@ -27,6 +27,7 @@ buildGoModule rec {
2727 meta = with lib; {
2828 description = "A tasty, self-hosted Git server for the command line";
2929 homepage = "https://github.com/charmbracelet/soft-serve";
30+ mainProgram = "soft";
3031 license = licenses.mit;
3132 maintainers = with maintainers; [ penguwin ];
3233 };
pkgs/tools/system/proot/default.nix+3−10
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch
1+{ lib, stdenv, fetchFromGitHub
22, talloc
33, pkg-config
44, libarchive
@@ -8,13 +8,13 @@
88
99stdenv.mkDerivation rec {
1010 pname = "proot";
11− version = "5.2.0";
11+ version = "5.3.0";
1212
1313 src = fetchFromGitHub {
1414 repo = "proot";
1515 owner = "proot-me";
1616 rev = "v${version}";
17− sha256 = "1ir3a7rp9rvpv9i8gjrkr383sqadgl7f9nflcrfg7q05bxapwiws";
17+ sha256 = "sha256-89d1a5QBusra0vd3Ph0lQalXrblBwogi6bNgvvpQL+Q=";
1818 };
1919
2020 postPatch = ''
@@ -26,13 +26,6 @@ stdenv.mkDerivation rec {
2626
2727 buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3;
2828 nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig;
29− patches = [
30− # without this patch the package does not build with python>3.7
31− (fetchpatch {
32− url = "https://github.com/proot-me/proot/pull/285.patch";
33− sha256= "1vncq36pr4v0h63fijga6zrwlsb0vb4pj25zxf1ni15ndxv63pxj";
34− })
35− ];
3629
3730 enableParallelBuilding = true;
3831
pkgs/tools/wayland/wluma/default.nix+1−1
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
5454 description = "Automatic brightness adjustment based on screen contents and ALS";
5555 homepage = "https://github.com/maximbaz/wluma";
5656 license = licenses.isc;
57− maintainers = with maintainers; [ yevhenshymotiuk jmc-figueira ];
57+ maintainers = with maintainers; [ yshym jmc-figueira ];
5858 platforms = platforms.linux;
5959 };
6060}