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

nixpkgs: 2025-06-27 -> 2025-07-02

Browse Source
This commit is contained in:
Colin
2025-07-02 19:52:46 +00:00
parent f1b8fd7a9d
commit 722c94d169
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overlays/preferences.nix
View File

@@ -130,10 +130,16 @@ in
# # }; # # };
# }; # };
# gvfs = super.gvfs.override { gvfs = super.gvfs.override {
# # saves 20 minutes of build time and cross issues, for unused feature # saves 20 minutes of build time and cross issues, for unused feature
# samba = null; # samba = null;
# }; # XXX(2025-07-02): avoid cross compilation error on thin-provisioning-tools by disabling the thing which pulls it in.
# see: <https://github.com/stratis-storage/devicemapper-rs/issues/965>
# however, thin-provisioning-tools uses `devicemapper` crate -- not `devicemapper-sys`;
# unclear if `devicemapper` intends to support this; manually enabling the feature did not fix any build error;
# my error seems to be that `devicemapper` is compiled _to the wrong platform_ (maybe the issue is in thin-provisioning-tools' build script)
udevSupport = false;
};
# haredoc = super.haredoc.override { # haredoc = super.haredoc.override {
# hareHook = crossHareHook; # hareHook = crossHareHook;

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 = "c2d8e89c022da73e133dfb625fd2af968e61766b"; rev = "9c10b2210daa0dbdfcc920ad03c07137f1e2f0a8";
sha256 = "sha256-7COgccrBl+gpcK4Z7BtI/zIjK1S5X/msqhpUgbaSueo="; sha256 = "sha256-TcW9Mg2Wk5mjY97ITfuDOyamJpTs2znmoRQ57ITG40o=";
version = "unstable-2025-06-27"; version = "unstable-2025-07-02";
branch = "master"; branch = "master";
} }

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 = "3196ee540c1c15a6f285f06033db31966a60b6d9"; rev = "858f9904d5c5077ead03d2ceda31d1d2c720ebaa";
sha256 = "sha256-cdGFN8jSajFQpNbxgCW+xpdTS4i/X3QFXO6uAqJIcyY="; sha256 = "sha256-7az9kKM6Vls+x5r64I9CyWZAcDWaYkWMU3tEsf/66II=";
version = "unstable-2025-06-27"; version = "unstable-2025-07-02";
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 = "6d81aa24da8f8efd625253074c76bbd7eda127e2"; rev = "9c22038d81b7d0d77b2ef9b5726dced6404769a0";
sha256 = "sha256-YvtKg5R3jaw78l/W5qCLnjLmHA2ja7DzLpT43Hhbs1U="; sha256 = "sha256-ZiyVEX+hbaMnJBCGldQVKTGIByNVlJCStMIE1BCr6Aw=";
version = "unstable-2025-06-27"; version = "unstable-2025-07-02";
branch = "staging"; branch = "staging";
} }