nixpkgs: bump 25.11 -> 26.05
Change-Id: I7747d38d38f3be69404f5dcc8147e5366a6a6964
This commit is contained in:
Generated
+4
-4
@@ -106,16 +106,16 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1773082486,
|
||||
"narHash": "sha256-TKUDrM0nKUo5s/b8jhjXa2prcu5KU5Cck3HBTRLDjfo=",
|
||||
"lastModified": 1780020239,
|
||||
"narHash": "sha256-ik+V883hTc6GG7TzjxMdhEoMV0hCbQPfsRtNsB1qWUQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7f8b8875bdb38a70c7b5ceb9ba6a6a8d69859e16",
|
||||
"rev": "c85dc29a9bcafa665b8ce0654ca019cdb05e63c6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11-small",
|
||||
"ref": "nixos-26.05-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
description = "Lix: A modern, delicious implementation of the Nix package manager";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11-small";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05-small";
|
||||
nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
|
||||
|
||||
# Required because Nix 2.18 is not in Nixpkgs ≥ 25.05 anymore.
|
||||
|
||||
+1
-1
@@ -140,7 +140,7 @@ pre-commit-run {
|
||||
treefmt = {
|
||||
enable = true;
|
||||
settings.formatters = [
|
||||
pkgs.nixfmt-rfc-style
|
||||
pkgs.nixfmt
|
||||
pkgs.ruff
|
||||
];
|
||||
};
|
||||
|
||||
@@ -196,15 +196,5 @@ lib.fix (self: {
|
||||
doCheck = false;
|
||||
doInstallCheck = false;
|
||||
});
|
||||
}
|
||||
// lib.optionalAttrs (nixpkgsFor ? aarch64-linux) {
|
||||
build-lowdown_2_0 = lib.genAttrs [ "aarch64-linux" ] (
|
||||
system:
|
||||
assert lib.versionOlder nixpkgsFor.${system}.native.lowdown.version "3.0.0";
|
||||
self.packages.${system}.nix.override {
|
||||
lowdown = nixpkgsFor.${system}.native.lowdown;
|
||||
lowdown-unsandboxed = nixpkgsFor.${system}.native.lowdown-unsandboxed;
|
||||
}
|
||||
);
|
||||
};
|
||||
})
|
||||
|
||||
+2
-2
@@ -691,7 +691,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doxygen,
|
||||
glibcLocales,
|
||||
just,
|
||||
nixfmt-rfc-style,
|
||||
nixfmt,
|
||||
skopeo,
|
||||
tree,
|
||||
|
||||
@@ -765,7 +765,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# docker image tool
|
||||
skopeo
|
||||
just
|
||||
nixfmt-rfc-style
|
||||
nixfmt
|
||||
# Included above when internalApiDocs is true, but we set that to
|
||||
# false intentionally to save dev build time.
|
||||
# To build them in a dev shell, you can set -Dinternal-api-docs=enabled when configuring.
|
||||
|
||||
Reference in New Issue
Block a user