Merge master into staging-next
This commit is contained in:
commit
930984c1de
|
@ -13620,10 +13620,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 = {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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" ];
|
||||
|
|
|
@ -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}";
|
||||
|
|
|
@ -77,6 +77,7 @@ rec {
|
|||
persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn";
|
||||
useGLVND = false;
|
||||
|
||||
broken = with kernel; kernelAtLeast "5.5";
|
||||
patches = [ ./vm_operations_struct-fault.patch ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue