colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-06-19 -> 2024-06-21

Browse Source
This commit is contained in:
Colin
2024-06-21 07:04:06 +00:00
parent ad8bcfc09e
commit a02f221628
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hosts/common/programs/assorted.nix
View File

@@ -1177,13 +1177,12 @@ in
]; ];
}; };
hardware.opengl = lib.mkIf config.sane.programs.guiApps.enabled ({ hardware.graphics = lib.mkIf config.sane.programs.guiApps.enabled ({
enable = true; enable = true;
driSupport = lib.mkDefault true;
} // (lib.optionalAttrs pkgs.stdenv.isx86_64 { } // (lib.optionalAttrs pkgs.stdenv.isx86_64 {
# for 32 bit applications # for 32 bit applications
# upstream nixpkgs forbids setting driSupport32Bit unless specifically x86_64 (so aarch64 isn't allowed) # upstream nixpkgs forbids setting enable32Bit unless specifically x86_64 (so aarch64 isn't allowed)
driSupport32Bit = lib.mkDefault true; enable32Bit = lib.mkDefault true;
})); }));
system.activationScripts.notifyActive = lib.mkIf config.sane.programs.guiApps.enabled { system.activationScripts.notifyActive = lib.mkIf config.sane.programs.guiApps.enabled {

12
hosts/common/programs/sanebox.nix
View File

@@ -44,19 +44,19 @@ in
# XXX: /run/current-system symlink can't be cached without forcing regular mass rebuilds: # XXX: /run/current-system symlink can't be cached without forcing regular mass rebuilds:
# mount it as if it were a directory instead. # mount it as if it were a directory instead.
"/run/current-system" = ""; "/run/current-system" = "";
} // lib.optionalAttrs config.hardware.opengl.enable { } // lib.optionalAttrs config.hardware.graphics.enable {
"/run/opengl-driver" = let "/run/opengl-driver" = let
gl = config.hardware.opengl; gl = config.hardware.graphics;
# from: <repo:nixos/nixpkgs:nixos/modules/hardware/opengl.nix> # from: <repo:nixos/nixpkgs:nixos/modules/hardware/graphics.nix>
package = pkgs.buildEnv { package = pkgs.buildEnv {
name = "opengl-drivers"; name = "opengl-drivers";
paths = [ gl.package ] ++ gl.extraPackages; paths = [ gl.package ] ++ gl.extraPackages;
}; };
in "${package}"; in "${package}";
} // lib.optionalAttrs (config.hardware.opengl.enable && config.hardware.opengl.driSupport32Bit) { } // lib.optionalAttrs (config.hardware.graphics.enable && config.hardware.graphics.enable32Bit) {
"/run/opengl-driver-32" = let "/run/opengl-driver-32" = let
gl = config.hardware.opengl; gl = config.hardware.graphics;
# from: <repo:nixos/nixpkgs:nixos/modules/hardware/opengl.nix> # from: <repo:nixos/nixpkgs:nixos/modules/hardware/graphics.nix>
package = pkgs.buildEnv { package = pkgs.buildEnv {
name = "opengl-drivers-32bit"; name = "opengl-drivers-32bit";
paths = [ gl.package32 ] ++ gl.extraPackages32; paths = [ gl.package32 ] ++ gl.extraPackages32;

14
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "8b50e555cc02c9c7f3b4d4202fad518554610a01"; master.rev = "3ed0e6824c1a677493e86904a9f7472fcef5b46a";
master.sha256 = "sha256-o5rR0HYVhci4l5otMfAtE2CmL5APRrcRVSBBSRkROWk="; master.sha256 = "sha256-PZWvWO/s0IPqT+OFwOUsm28Nznr7YceWcdlJHYW1WU0=";
staging.rev = "8b50e555cc02c9c7f3b4d4202fad518554610a01"; staging.rev = "3ed0e6824c1a677493e86904a9f7472fcef5b46a";
staging.sha256 = "sha256-o5rR0HYVhci4l5otMfAtE2CmL5APRrcRVSBBSRkROWk="; staging.sha256 = "sha256-PZWvWO/s0IPqT+OFwOUsm28Nznr7YceWcdlJHYW1WU0=";
staging-next.rev = "8b50e555cc02c9c7f3b4d4202fad518554610a01"; staging-next.rev = "3ed0e6824c1a677493e86904a9f7472fcef5b46a";
staging-next.sha256 = "sha256-o5rR0HYVhci4l5otMfAtE2CmL5APRrcRVSBBSRkROWk="; staging-next.sha256 = "sha256-PZWvWO/s0IPqT+OFwOUsm28Nznr7YceWcdlJHYW1WU0=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "24.05-unstable-2024-06-19"; version = "24.05-unstable-2024-06-21";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;