From 2b36019dfaff6f071de239858a8e23b552b971a4 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 4 May 2025 04:28:50 +0000 Subject: [PATCH] nixpkgs: 2025-05-02 -> 2025-05-03 --- overlays/cross.nix | 50 +------------------ pkgs/by-name/nixpkgs-bootstrap/master.nix | 6 +-- .../nixpkgs-bootstrap/staging-next.nix | 6 +-- pkgs/by-name/nixpkgs-bootstrap/staging.nix | 6 +-- 4 files changed, 10 insertions(+), 58 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 7213a796e..4d349b0ca 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -123,54 +123,6 @@ let inherit (cargo) meta; }; in with final; { - # bamf: required via pantheon.switchboard -> wingpanel -> gala - # 2025/05/01: upstreaming is unblocked, out for PR: - # bamf = prev.bamf.overrideAttrs (upstream: { - # # "You must have gtk-doc >= 1.0 installed to build documentation" - # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ - # pkg-config #< to find gtk-doc - # (buildPackages.python3.withPackages (ps: with ps; [ lxml ])) # Tests - # ]; - # # nativeBuildInputs = [ - # # # (python3.withPackages (ps: with ps; [ lxml ])) # Tests - # # autoreconfHook - # # dbus - # # docbook_xsl - # # gnome.gnome-common - # # gobject-introspection - # # gtk-doc - # # pkg-config - # # vala - # # which - # # wrapGAppsHook3 - # # xorg.xorgserver - # # ] ++ [ - # # nativeBuildInputs = lib.tail upstream.nativeBuildInputs ++ [ - # nativeBuildInputs = ( - # lib.filter (p: - # !lib.hasPrefix python3.pname (p.name or p.pname or "") && - # # ... i can't figure out where it's getting libX11 from :| - # (p.pname or "") != xorg.xorgserver.pname && - # (p.pname or "") != gnome.gnome-common.pname - # ) - # upstream.nativeBuildInputs - # ) ++ [ - # buildPackages.gettext #< for msgfmt - # ]; - - # buildInputs = upstream.buildInputs ++ [ - # xorg.xorgserver #< upstream incorrectly places this in `nativeBuildInputs` - # ]; - - # # nativeBuildInputs = upstream.nativeBuildInputs ++ [ - # # (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ lxml ])) # Tests - # # ]; - # configureFlags = [ - # "--enable-gtk-doc" - # # "--enable-headless-tests" #< can't test when cross compiling - # ]; - # }); - # binutils = prev.binutils.override { # # fix that resulting binary files would specify build #!sh as their interpreter. # # dtrx is the primary beneficiary of this. @@ -313,7 +265,7 @@ in with final; { # ]; # }); - # 2025/05/01: blocked on psqlodbc + # 2025/05/02: blocked on psqlodbc (available after next staging merge) # used by hyprland (which is an indirect dep of waybar, nwg-panel, etc), # which it shells out to at runtime (and hence, not ever used by me). hyprland-qtutils = null; diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index b99f88788..04e04230b 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "d66115b18ccf2fbb03da4f2ea8a41499eb8d3136"; - sha256 = "sha256-XONo9xGd3zGt/iHmIDZ+Uj/FZxRRFmrDrIFqYtzoPnM="; - version = "0-unstable-2025-05-02"; + rev = "07bd4a9d9ac72fd5d10e16f483def969a19e42d2"; + sha256 = "sha256-s72L1X/BJpBPpLUexvkLNCtlrtE2YZITNPDHByaUfeo="; + version = "0-unstable-2025-05-03"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index 1d785e171..029fb60de 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "7388d7aff5b565cb94e799228d1d003eb557ed07"; - sha256 = "sha256-rIcW4e4/ITrYTPXKQIXmcx+OIHVW6CkM+XffMHrAT8A="; - version = "0-unstable-2025-05-01"; + rev = "2ff912d92b5a3e4031e3d8e0ac53de6e4eb016aa"; + sha256 = "sha256-/Y/LFzcNctp0fv6foQ5tFVkdV73OYDyQ7bhjIl1Ns3U="; + version = "0-unstable-2025-05-03"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index 1a4702dca..898994dd6 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "d37e6c5b0ca46fc4ca0533e59ff6f23bc9b6ae69"; - sha256 = "sha256-r4DYjNQcY5uPas512hRUkjV8rLYZLr0dOhaX7eFBviI="; - version = "0-unstable-2025-05-02"; + rev = "f5f6bfb2d3cbf4923da7c568cc44105c89700b1e"; + sha256 = "sha256-bZQaqLZ8j4iimpCdnQ9YZJPPFPdFbqGF/Eh8zM8wzoA="; + version = "0-unstable-2025-05-03"; branch = "staging"; }