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

nixpkgs: 2025-05-02 -> 2025-05-03

Browse Source
This commit is contained in:
Colin
2025-05-04 04:28:50 +00:00
parent 4f558743e5
commit 2b36019dfa
4 changed files with 10 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
overlays/cross.nix
View File

@@ -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: <https://github.com/NixOS/nixpkgs/pull/403541>
# 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;

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -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";
}

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -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";
}

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -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";
}