nixpkgs: 2025-05-15 -> 2025-05-17
This commit is contained in:
@@ -378,7 +378,7 @@ in
|
||||
"megapixels" # camera app (does not support PPP as of 2024-11-29)
|
||||
"megapixels-next" # camera app (which supports PPP, as of 2024-11-29)
|
||||
"notejot" # note taking, e.g. shopping list
|
||||
"planify" # todo-tracker/planner
|
||||
# "planify" # todo-tracker/planner (XXX(2025-05-16): does not build; gxml tests fail against glib 2.84.1; planify itself fails still, if gxml.doCheck forced false)
|
||||
"portfolio-filemanager"
|
||||
# "tangram" # web browser
|
||||
"wike" # Wikipedia Reader
|
||||
|
||||
@@ -50,13 +50,14 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
packageUnwrapped = pkgs.dino.override {
|
||||
# XXX(2024/04/24): build without echo cancelation (i.e. force WITH_VOICE_PROCESSOR to be undefined).
|
||||
# this means that if the other end of the call is on speaker phone, i'm liable to hear my own voice
|
||||
# leave their speaker, enter their mic, and then return to me.
|
||||
# the benefit is a >50% reduction in CPU use. insignificant on any modern PC; make-or-break on a low-power Pinephone.
|
||||
webrtc-audio-processing = null;
|
||||
};
|
||||
# packageUnwrapped = pkgs.dino.override {
|
||||
# # XXX(2024/04/24): build without echo cancelation (i.e. force WITH_VOICE_PROCESSOR to be undefined).
|
||||
# # this means that if the other end of the call is on speaker phone, i'm liable to hear my own voice
|
||||
# # leave their speaker, enter their mic, and then return to me.
|
||||
# # the benefit is a >50% reduction in CPU use. insignificant on any modern PC; make-or-break on a low-power Pinephone.
|
||||
# # XXX(2025/05/16): this appears to no longer be optional
|
||||
# # webrtc-audio-processing_1 = null;
|
||||
# };
|
||||
|
||||
# suggestedPrograms = [
|
||||
# "gnome-keyring"
|
||||
|
||||
@@ -223,13 +223,9 @@ in with final; {
|
||||
cargo = crossCargo;
|
||||
});
|
||||
|
||||
# 2025/05/01: upstreaming is unblocked
|
||||
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
|
||||
# gnustep-base = prev.gnustep-base.overrideAttrs (upstream: {
|
||||
# # fixes: "checking FFI library usage... ./configure: line 11028: pkg-config: command not found"
|
||||
# # nixpkgs has this in nativeBuildInputs... but that's failing when we partially emulate things.
|
||||
# buildInputs = (upstream.buildInputs or []) ++ [ prev.pkg-config ];
|
||||
# });
|
||||
# 2025/05/16: out for PR: <https://github.com/NixOS/nixpkgs/pull/407664>
|
||||
# fixes: `pkcs11/gkm/meson.build:47:20: ERROR: Program 'glib-genmarshal' not found or not executable`
|
||||
# gnome-keyring = addNativeInputs [ buildPackages.glib ] prev.gnome-keyring;
|
||||
|
||||
# 2025/01/13: upstreaming is blocked on gnome-shell
|
||||
# fixes: "gdbus-codegen not found or executable"
|
||||
@@ -260,6 +256,25 @@ in with final; {
|
||||
# ];
|
||||
# });
|
||||
|
||||
gnome-user-share = prev.gnome-user-share.override {
|
||||
cargo = crossCargo;
|
||||
};
|
||||
# 2025/05/16: this part is out for PR: <https://github.com/NixOS/nixpkgs/pull/407667>
|
||||
# .overrideAttrs {
|
||||
# # see src/meson.build.
|
||||
# # nix default is `plain` but that has g-u-s build in debug mode,
|
||||
# # which disagrees with the build directories used by `crossCargo` (target/debug v.s. target/release)
|
||||
# mesonBuildType = "release";
|
||||
# };
|
||||
|
||||
# 2025/05/01: upstreaming is unblocked
|
||||
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
|
||||
# gnustep-base = prev.gnustep-base.overrideAttrs (upstream: {
|
||||
# # fixes: "checking FFI library usage... ./configure: line 11028: pkg-config: command not found"
|
||||
# # nixpkgs has this in nativeBuildInputs... but that's failing when we partially emulate things.
|
||||
# buildInputs = (upstream.buildInputs or []) ++ [ prev.pkg-config ];
|
||||
# });
|
||||
|
||||
# 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).
|
||||
@@ -306,6 +321,10 @@ in with final; {
|
||||
|
||||
lemoa = prev.lemoa.override { cargo = crossCargo; };
|
||||
|
||||
# 2025/05/16: upstreaming is unblocked; out for PR: <https://github.com/NixOS/nixpkgs/pull/407662>
|
||||
# fixes `Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)`
|
||||
# libmanette = addDepsBuildBuild [ pkgsBuildBuild.pkg-config ] prev.libmanette;
|
||||
|
||||
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
|
||||
# phonon = super.phonon.overrideAttrs (orig: {
|
||||
# # fixes "ECM (required version >= 5.60), Extra CMake Modules"
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "d0e6be24d3d1a9eb8e26a6883ab7f3b1a9c5a0f7";
|
||||
sha256 = "sha256-0jCPNY7VtyQCIGpGpbhIHE2GjYJvQ+s3kv5PCkMSbVk=";
|
||||
version = "unstable-2025-05-15";
|
||||
rev = "e09b1838ad4634ba8c9779824b8bd91108708aee";
|
||||
sha256 = "sha256-/J1RSSqBfYn2O+HAsqkLWuS+SqeSf4xYLuoKpzsyCqU=";
|
||||
version = "unstable-2025-05-17";
|
||||
branch = "master";
|
||||
}
|
||||
|
||||
@@ -29,47 +29,29 @@ let
|
||||
);
|
||||
in
|
||||
[
|
||||
(fetchpatch' {
|
||||
name = "libmanette: fix cross compilation";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/407662";
|
||||
hash = "sha256-wubEvz5MgMS9g4PAzy4E0pUZ30AW4AvD7ZGQeie9/Mk=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "gnome-keyring: fix cross compilation";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/407664";
|
||||
hash = "sha256-mlzlu3S9UuKCqQ+50ycC00FMp587pN5iiWc4OY0VrLE=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "gnome-user-share: build in release mode";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/407667";
|
||||
hash = "sha256-WACEQkmKpuliraP6RY2e30/7ta4mQpgFrLCueMB9HIo=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "xarchiver: build with strictDeps=true";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/406599";
|
||||
hash = "sha256-xaI6YEGuxZaYtaTbfeTK9cr2ELhWnrO+Azic5aG6XbE=";
|
||||
})
|
||||
(fetchpatch' {
|
||||
# 2025-05-03: merged into staging
|
||||
name = "qt6.{qttools,qtwayland}: fix cross compilation";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/403830";
|
||||
hash = "sha256-NaDHdsfKY3Gg3RJTMgbHYqnezdLuei/71d0d+/cubmE=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-05-03: merged into staging
|
||||
name = "qt6.qttranslations: bootstrap directly";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/403944";
|
||||
hash = "sha256-ZjEGozWbxfplMGU61ohTkqjDmhZRvVildXx6TWlHhvQ=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-05-02: merged into staging
|
||||
name = "fcitx5: fix cross compilation";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/399981";
|
||||
hash = "sha256-BSnp80+8cpb+1yFaB0g7ZnPgQQqC7qo+ReMJUtlKgr4=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-05-02: merged into staging
|
||||
name = "psqlodbc: fix cross";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/403706";
|
||||
hash = "sha256-VKX8RpD8V0tYC6w0O97iJN1r8nVRRSU1FCY3hXlfZoc=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
# 2025-05-04: merged into staging
|
||||
name = "libcdio: omit manpages when cross compiling";
|
||||
# saneCommit = "2248d99b4edb7b01b667139f16949367773bf03a";
|
||||
# hash = "sha256-OjK34Mo/5JXFNn4rBFhWq8wfeHItM6zzDodMPBYyERY=";
|
||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/404076"; #< someone else's fix (worse though :P)
|
||||
hash = "sha256-pP4rnz8vskuVC5hkoGORVpcW3/kFF3m4gSW25H4TJvg=";
|
||||
})
|
||||
|
||||
(fetchpatch' {
|
||||
name = "zelda64recomp: init at 1.2.0";
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "b6ba3caa1bf83f467161dbd0f161055bfc0a40cb";
|
||||
sha256 = "sha256-dD17uuhUkCzVHqf7ezWbWr7J2zZymeTrWkMw4zD5xQY=";
|
||||
version = "unstable-2025-05-15";
|
||||
rev = "f4d64c2b55b6fc3b2fde99ebf1f573abfb7d7e9a";
|
||||
sha256 = "sha256-+qTKO4TcDFcaAP2xwkxWH38z0PQY1uhUZupldCuV4Y0=";
|
||||
version = "unstable-2025-05-17";
|
||||
branch = "staging-next";
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
mkNixpkgs ? import ./mkNixpkgs.nix {},
|
||||
}:
|
||||
mkNixpkgs {
|
||||
rev = "be8530bd408782b69aa28c7b67326668240fff9a";
|
||||
sha256 = "sha256-54R2R4dzeTAjOpcUQj6ai13LQwtYgRgS98xAGGc2wgs=";
|
||||
version = "unstable-2025-05-15";
|
||||
rev = "04ea9f3648120ef4700f9aaea9974f749282472f";
|
||||
sha256 = "sha256-ePnJk44VleZaPnX1KfUXiup6wdxh8lrqRmBa+86INWI=";
|
||||
version = "unstable-2025-05-17";
|
||||
branch = "staging";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user