From e32de5d3a1d5a300aca7cf4d60808ec790085b40 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 18 Feb 2025 05:09:07 +0000 Subject: [PATCH] nixpkgs: 0-unstable-2025-02-08 -> 0-unstable-2025-02-17 --- overlays/cross.nix | 6 ++++++ pkgs/by-name/nixpkgs-bootstrap/master.nix | 6 +++--- pkgs/by-name/nixpkgs-bootstrap/staging-next.nix | 6 +++--- pkgs/by-name/nixpkgs-bootstrap/staging.nix | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 1fdf49219..a76e0133e 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -955,6 +955,12 @@ in with final; { # upstream.postBuild; # }); + wvkbd = prev.wvkbd.overrideAttrs (upstream: { + nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [ + buildPackages.scdoc + ]; + }); + # 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 684e261f3..76ec7b854 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 = "fa648b2835f6cc0e77bd3b246cf8c80f126f0139"; - sha256 = "sha256-1Vg8DUmf9Re46lbjWq02IV0syQJLUO1y5CoUcWP5C/s="; - version = "0-unstable-2025-02-08"; + rev = "49bae9aaddd584d28321f729e166903fb81ad23c"; + sha256 = "sha256-mIY+RwUDvtVN1/6g0CbJKqlG3jhwR9ttX1Q3h9C0cw8="; + version = "0-unstable-2025-02-17"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index 42943e624..6ff12d5d9 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 = "6793b353338d2bfd6a95bef48e4bc78f6dc24436"; - sha256 = "sha256-OqJKH1Rnbb/nO9ISlfDl47G1vvolHK1KiOcwhxAZ+7A="; - version = "0-unstable-2025-02-07"; + rev = "fc7fa5f568c170348fa21308f135fa9cd0807725"; + sha256 = "sha256-9DP8lq3aHYmSCVgDNKGiNoEHlwkz+bb+5K+KYDFF1Ng="; + version = "0-unstable-2025-02-17"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index 11638877c..f5707374c 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 = "746797476c9e43c348bc0b8d2bafa4c65b74e7c4"; - sha256 = "sha256-0eXqAsNHngVQbXgXE7Fpuo3m2fL9u4zZlWkMhNsdhz0="; - version = "0-unstable-2025-02-07"; + rev = "d9ea73fab625fb1f00acc75b22315a0ba49436a4"; + sha256 = "sha256-uqFCZRSB1ZRKVqG9k6jh1jsvFGGCteTc6zBNzH0YHAU="; + version = "0-unstable-2025-02-16"; branch = "staging"; }