flake: Use nixpkgs 24.11

nixpkgs 24.11 changes how we access xonsh yet again
and updates clang.

Unfortunately, clang 18 produces significantly more
warnings on existing code that is challenging to fix.
Make sure that doesn't error when we're running
`-Werror` builds.

Change-Id: If0141a46a8b445a0e7d6f86f939e8c8e03569bf5
This commit is contained in:
Artemis Tosini 2024-11-21 22:58:12 +00:00
parent 66f6dbda32
commit 1678e499b0
Signed by: artemist
GPG key ID: EE5227935FE3FF18
4 changed files with 7 additions and 7 deletions

View file

@ -34,16 +34,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1727184566,
"narHash": "sha256-mgdK8BcFsLSNhe780+cHbEUbZ3OruLa1T/xgQlL4Aj4=",
"lastModified": 1732237847,
"narHash": "sha256-WwtrPxym9sQtwZkemxUfT00iCWfXxzuVAC7uFP1m1Y0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "48c3030083c46042584531bc9d931020f1975677",
"rev": "9bbcb9a5a7e54369faaced5fb0ddad1fda21b751",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05-small",
"ref": "nixos-24.11-small",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -2,7 +2,7 @@
description = "Lix: A modern, delicious implementation of the Nix package manager";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
pre-commit-hooks = {
url = "github:cachix/git-hooks.nix";

View file

@ -486,6 +486,7 @@ add_project_arguments(
'-include', 'config.h',
'-Wno-unused-parameter',
'-Wno-deprecated-declarations',
'-Wno-missing-field-initializers',
'-Wimplicit-fallthrough',
'-Werror=switch',
'-Werror=switch-enum',

View file

@ -470,7 +470,6 @@ stdenv.mkDerivation (finalAttrs: {
just,
nixfmt-rfc-style,
skopeo,
xonsh,
# Lix specific packages
pre-commit-checks,
@ -506,7 +505,7 @@ stdenv.mkDerivation (finalAttrs: {
p.requests
p.xdg-base-dirs
p.packaging
(p.toPythonModule pkgsBuildHost.xonsh.passthru.unwrapped)
p.xonsh
]
);
pythonEnv = python3.pythonOnBuildForHost.withPackages pythonPackages;