alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-08-02 00:01:27 +00:00 committed by GitHub
parent 7996eebcae 49fcc13e14
commit b68241ff6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/x11/display-managers/set-session.py
View file

@ -72,11 +72,14 @@ def main():
f"Setting session name: {session}, as we found the existing wayland-session: {session_file}" f"Setting session name: {session}, as we found the existing wayland-session: {session_file}"
) )
user.set_session(session) user.set_session(session)
user.set_session_type("wayland")
elif is_session_xsession(session_file): elif is_session_xsession(session_file):
logging.debug( logging.debug(
f"Setting session name: {session}, as we found the existing xsession: {session_file}" f"Setting session name: {session}, as we found the existing xsession: {session_file}"
) )
user.set_x_session(session) user.set_x_session(session)
user.set_session(session)
user.set_session_type("x11")
else: else:
logging.error(f"Couldn't figure out session type for {session_file}") logging.error(f"Couldn't figure out session type for {session_file}")
sys.exit(1) sys.exit(1)

7
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View file

@ -1,8 +1,9 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let let
version = "5.13.5"; version = "5.13.7";
suffix = "xanmod1-cacule"; release = "1";
suffix = "xanmod${release}-cacule";
in in
buildLinux (args // rec { buildLinux (args // rec {
inherit version; inherit version;
@ -12,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod"; owner = "xanmod";
repo = "linux"; repo = "linux";
rev = modDirVersion; rev = modDirVersion;
sha256 = "sha256-Vhshu3mNkQ58TEOUBOuF7jLBlablxg/BioUyd96lI5g="; sha256 = "sha256-6SppDriZWzLu6Qye1e6ciiE+Ro63vDyabxfgWS/PTSo=";
}; };
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {

4
pkgs/os-specific/linux/rdma-core/default.nix
View file

@ -3,7 +3,7 @@
} : } :
let let
version = "35.0"; version = "36.0";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "rdma-core"; pname = "rdma-core";
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
owner = "linux-rdma"; owner = "linux-rdma";
repo = "rdma-core"; repo = "rdma-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ra0m1s0029qgcq0li7md6pkri7pcc4iy3cd6jrrqs9c6n1clnnd"; sha256 = "0x3mpwmhln6brwrwix9abdq1bs9zi4qnr3r64vwqk7l6f43mqd30";
}; };
nativeBuildInputs = [ cmake pkg-config pandoc docutils ]; nativeBuildInputs = [ cmake pkg-config pandoc docutils ];