Merge master into haskell-updates

NixOS · Jun 9, 2024 · b26f1fe · b26f1fe
2 parents c23d3f1 + 1acd994
commit b26f1fe
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
@@ -196,6 +196,7 @@
  ./programs/fzf.nix
  ./programs/gamemode.nix
  ./programs/gamescope.nix
+ ./programs/gdk-pixbuf.nix
  ./programs/geary.nix
  ./programs/git.nix
  ./programs/gnome-disks.nix
@@ -1497,7 +1498,6 @@
  ./services/x11/display-managers/xpra.nix
  ./services/x11/extra-layouts.nix
  ./services/x11/fractalart.nix
- ./services/x11/gdk-pixbuf.nix
  ./services/x11/hardware/cmt.nix
  ./services/x11/hardware/digimend.nix
  ./services/x11/hardware/synaptics.nix

diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix → nixos/modules/programs/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix → nixos/modules/programs/gdk-pixbuf.nix
@@ -1,16 +1,20 @@
 { config, lib, pkgs, ... }:
 
 let
- cfg = config.services.xserver.gdk-pixbuf;
+ cfg = config.programs.gdk-pixbuf;
 
  loadersCache = pkgs.gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
- extraLoaders = lib.unique (cfg.modulePackages);
+ extraLoaders = lib.unique cfg.modulePackages;
  };
 in
 
 {
+ imports = [
+ (lib.mkRenamedOptionModule [ "services" "xserver" "gdk-pixbuf" ] [ "programs" "gdk-pixbuf" ])
+ ];
+
  options = {
- services.xserver.gdk-pixbuf.modulePackages = lib.mkOption {
+ programs.gdk-pixbuf.modulePackages = lib.mkOption {
  type = lib.types.listOf lib.types.package;
  default = [ ];
  description = "Packages providing GDK-Pixbuf modules, for cache generation.";
@@ -22,7 +26,7 @@ in
  # GDK_PIXBUF_MODULE_FILE to point to it.
  config = lib.mkIf (cfg.modulePackages != []) {
  environment.sessionVariables = {
- GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
+ GDK_PIXBUF_MODULE_FILE = loadersCache;
  };
  };
 }
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -202,7 +202,7 @@ in {
  environment.sessionVariables.KPACKAGE_DEP_RESOLVERS_PATH = "${kdePackages.frameworkintegration.out}/libexec/kf6/kpackagehandlers";
 
  # Enable GTK applications to load SVG icons
- services.xserver.gdk-pixbuf.modulePackages = [pkgs.librsvg];
+ programs.gdk-pixbuf.modulePackages = [pkgs.librsvg];
 
  fonts.packages = [cfg.notoPackage pkgs.hack-font];
  fonts.fontconfig.defaultFonts = {

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -327,7 +327,7 @@ in
  };
 
  # Enable GTK applications to load SVG icons
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+ programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 
  fonts.packages = with pkgs; [ cfg.notoPackage hack-font ];
  fonts.fontconfig.defaultFonts = {

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -153,7 +153,7 @@ in
  }];
 
  services.xserver.updateDbusEnvironment = true;
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+ programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 
  # Enable helpful DBus services.
  services.udisks2.enable = true;

diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
@@ -52,10 +52,10 @@ stdenv.mkDerivation rec {
  "prefix=$(out)"
  "USE_BINARYBUILDER=0"
  ] ++ lib.optionals stdenv.isx86_64 [
- # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py
- "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"
+ # https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh
+ "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)"
  ] ++ lib.optionals stdenv.isAarch64 [
- "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm"
+ "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;carmel,clone_all;apple-m1,base(3);neoverse-512tvb,base(3)"
  ];
 
  # remove forbidden reference to $TMPDIR