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

nixpkgs: update, drop upstreamed loupe/pwvucontrol cross patches

Browse Source
This commit is contained in:
Colin
2025-08-26 18:14:55 +00:00
parent 0550498cd1
commit 1277c73304
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overlays/cross.nix
View File

@@ -311,11 +311,6 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; }; # callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# }); # });
# 2025/08/26: upstreaming unblocked; out for PR: <https://github.com/NixOS/nixpkgs/pull/437059>
# loupe = prev.loupe.override {
# cargo = crossCargo;
# };
# 2024/11/19: upstreaming is unblocked # 2024/11/19: upstreaming is unblocked
mepo = (prev.mepo.override { mepo = (prev.mepo.override {
# nixpkgs mepo correctly puts `zig_0_13.hook` in nativeBuildInputs, # nixpkgs mepo correctly puts `zig_0_13.hook` in nativeBuildInputs,
@@ -518,11 +513,6 @@ in with final; {
# ]; # ];
# } prev.phosh-mobile-settings; # } prev.phosh-mobile-settings;
# 2025/08/26: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/437056>
# pwvucontrol = prev.pwvucontrol.override {
# cargo = crossCargo;
# };
# pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ # pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
# (pyself: pysuper: { # (pyself: pysuper: {
# # 2025/07/23: upstreaming is unblocked, but solution is untested. # # 2025/07/23: upstreaming is unblocked, but solution is untested.

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

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "77ae3f85d5e814698380c00ad3a867ebc3204cb1"; rev = "465ab8f0977d05657b1b4adc6e7e06fe4db04c0c";
sha256 = "sha256-s9mVQll30JhqPklsDhpyPYhavoJA30tLausoJMfuyPY="; sha256 = "sha256-yHIaDRjaBtRjYbm1ByhRqsAnMncLTG/uDDHHC2wXBMY=";
version = "unstable-2025-08-26"; version = "unstable-2025-08-26";
branch = "master"; branch = "master";
} }

12
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -62,18 +62,6 @@ in
hash = "sha256-B7s2aNVony+G7FW2PaR7FVO7zzWa7SiLONWRGrsXA3A="; hash = "sha256-B7s2aNVony+G7FW2PaR7FVO7zzWa7SiLONWRGrsXA3A=";
}) })
(fetchpatch' {
name = "pwvucontrol: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437056";
hash = "sha256-JOAyYmpTH3p7W+AXnlVyiyi5CggNZHX2fCGGBEp8iAA=";
})
(fetchpatch' {
name = "loupe: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437059";
hash = "sha256-c4XJ5R0HQ1FtyWWzajy+qT8+Gbe53n1PvBKujLEsTdY=";
})
(fetchpatch' { (fetchpatch' {
name = "coincurve: fix build"; name = "coincurve: fix build";
# saneCommit = "cd118a2491e613f0d4dd8673a6ac17a0094dd987"; # saneCommit = "cd118a2491e613f0d4dd8673a6ac17a0094dd987";