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

nixpkgs: 2025-06-18 -> 2025-06-20

Browse Source
This commit is contained in:
Colin
2025-06-21 06:28:26 +00:00
parent 7476f80cbe
commit 4703744aa1
7 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
overlays/cross.nix
View File

@@ -304,6 +304,9 @@ in with final; {
# "setup: line 1595: ant: command not found" # "setup: line 1595: ant: command not found"
# i2p = mvToNativeInputs [ ant gettext ] prev.i2p; # i2p = mvToNativeInputs [ ant gettext ] prev.i2p;
# 2025/06/20: upstreaming is blocked on perl; see nixpkgs branch `2025-06-20-ibus`
ibusMinimal = addBuildInputs [ vala ] prev.ibusMinimal;
# 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc # 2024/08/12: upstreaming is blocked on lua, lpeg, pandoc, unicode-collation, etc
# iotas = prev.iotas.overrideAttrs (_: { # iotas = prev.iotas.overrideAttrs (_: {
# # error: "<iotas> is not allowed to refer to the following paths: <build python>" # # error: "<iotas> is not allowed to refer to the following paths: <build python>"

1
overlays/preferences.nix
View File

@@ -47,6 +47,7 @@ in
electron_33 = electron_33-bin; electron_33 = electron_33-bin;
electron_34 = electron_34-bin; electron_34 = electron_34-bin;
electron_35 = electron_35-bin; electron_35 = electron_35-bin;
electron_36 = electron_36-bin;
# evolution-data-server = super.evolution-data-server.override { # evolution-data-server = super.evolution-data-server.override {
# # OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation # # OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation

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

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "d59e35adb19947a7584738398928a6d9f5755a23"; rev = "2dd47dccb7002e10edfe7606f6286d133da15c4f";
sha256 = "sha256-KGMngntmLmHGvwuqo51Er92TeCUNxkKAPWD3M2RFl9A="; sha256 = "sha256-easOEqE6LzbsHSXaXBeeXtS4/KZNjX9BFV3ZvyEZzO8=";
version = "unstable-2025-06-18"; version = "unstable-2025-06-20";
branch = "master"; branch = "master";
} }

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

@@ -29,13 +29,6 @@ let
); );
in in
[ [
# (fetchpatch' {
# # just here for me to test the PR
# name = "nixos/bind: only listen on ipv6 if enabled";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/410501";
# hash = "sha256-PokfJhlY+8LYAjXE8s/JoT3Kls3vPrZaT8KMmV9IBvw=";
# })
(fetchpatch' { (fetchpatch' {
name = ''nixos/bind: add an "extraArgs" option''; name = ''nixos/bind: add an "extraArgs" option'';
# saneCommit = "ab65c92241bd4acab25aad19d0fea4873c1bc3b7"; # saneCommit = "ab65c92241bd4acab25aad19d0fea4873c1bc3b7";
@@ -44,17 +37,32 @@ in
}) })
(fetchpatch' { (fetchpatch' {
# XXX(2025-05-17): merged into staging # TODO(2025-06-20): send for PR (branch: pr-perl540-cross)
name = "libmanette: fix cross compilation"; name = "perl540: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/407662"; saneCommit = "fb694775923041a4e5b6f40b2d2ee88b1749c82b";
hash = "sha256-1+izT6Y15LagapzVfBjzNU0xJiGfJkl1+Y7IACRVD84="; hash = "sha256-dEVUF4MPY85yBh2cvnnXoH/sAcajPREVSgo8lQ/Z2og=";
})
# (fetchpatch' {
# # TODO(2025-06-20): send for PR (branch: 2025-06-20-ibus; requires perl fix)
# # N.B.: forces rebuild of qtwebengine, electron, probably firefox. better to apply specifically to cross, in overlays/cross.nix
# name = "ibusMinimal: fix cross compilation";
# saneCommit = "67b8e690bf3d38b73d7a215788898e122c75475f";
# hash = "sha256-M7shgRayQj/S0K6AMwED1BYS0T7wc/fFYfN5OxddVA0=";
# })
(fetchpatch' {
# TODO(2025-06-20): send for PR (branch: 2025-06-20-sdl-cross; requires ibusMinimal fix)
name = "sdl3: fix cross compilation";
saneCommit = "7047d2272f3877f5f2aeeb42d4b7421e4e3e52a6";
hash = "sha256-U5aq456mtuMULmw8FDjlXYR0DhQxrdy6UDgVjlpsqGo=";
}) })
(fetchpatch' { (fetchpatch' {
# XXX(2025-06-07): merged into master # XXX(2025-06-20): merged into master
name = "xarchiver: build with strictDeps=true"; name = "handbrake: fix build";
prUrl = "https://github.com/NixOS/nixpkgs/pull/406599"; prUrl = "https://github.com/NixOS/nixpkgs/pull/418610";
hash = "sha256-CdNriljvuHFDCRiTu5P5BjCsyPT4gc1KzMYpisEhGcU="; hash = "sha256-dKa9r0HuWyUp/Jz6IOKczEnQ8Ag6gesN0xjWKBdPPm4=";
}) })
(fetchpatch' { (fetchpatch' {

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "a54d7ecdb4b52abf6ef0fcac6b2158f4b25b5360"; rev = "27737dd56ef41944c55e6ecf44677c9ef9c1b0d6";
sha256 = "sha256-iwOvzRlc2e1n16uhCYbS+8JuupNV8ao+Vzejdn8AIl4="; sha256 = "sha256-b6CrXmLs0BJV/sPP8HJqqqiy6tEu2yELrLOGdPS3Cdc=";
version = "unstable-2025-06-18"; version = "unstable-2025-06-20";
branch = "staging-next"; branch = "staging-next";
} }

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

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "9aece7542b3491d94c4fda6819e10697c37ace2f"; rev = "824e6df72824bf9a877493e87a1bac169641a60d";
sha256 = "sha256-vbu8E3vaUznZ7yy/J1o1NJmlVloI0QnUPVu4SFoUucM="; sha256 = "sha256-txWl5AKHatHlbCjcsnvsunjJCZR11C3C/7h6QdrGrbY=";
version = "unstable-2025-06-18"; version = "unstable-2025-06-20";
branch = "staging"; branch = "staging";
} }

6
pkgs/by-name/nixpkgs-wayland/package.nix
View File

@@ -7,8 +7,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nix-community"; owner = "nix-community";
repo = "nixpkgs-wayland"; repo = "nixpkgs-wayland";
rev = "4b9428823affb0731bebcd453bf7f029b23b3c24"; rev = "52d508b9562db7e961a4c75ab7abe0e4c03d00a3";
hash = "sha256-ibxQfk2euiazle8oX32YyBxsmy5QoYtYdx/HFidSk14="; hash = "sha256-hosJzS/379ji7USvHC4UUtQBMAAjKFiKHnSpEqeENpA=";
}; };
flake = import "${src}/flake.nix"; flake = import "${src}/flake.nix";
evaluated = flake.outputs { evaluated = flake.outputs {
@@ -25,7 +25,7 @@ let
in src.overrideAttrs (base: { in src.overrideAttrs (base: {
# attributes required by update scripts # attributes required by update scripts
pname = "nixpkgs-wayland"; pname = "nixpkgs-wayland";
version = "0-unstable-2025-06-18"; version = "0-unstable-2025-06-20";
src = src; src = src;
# passthru only nixpkgs-wayland's own packages -- not the whole nixpkgs-with-nixpkgs-wayland-as-overlay: # passthru only nixpkgs-wayland's own packages -- not the whole nixpkgs-with-nixpkgs-wayland-as-overlay: