diff --git a/flake.lock b/flake.lock index ac33089f1..8ad445147 100644 --- a/flake.lock +++ b/flake.lock @@ -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" } diff --git a/flake.nix b/flake.nix index 5b9da52cd..e5bd157e8 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/meson.build b/meson.build index 9a3967289..dab2e063f 100644 --- a/meson.build +++ b/meson.build @@ -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', diff --git a/package.nix b/package.nix index 4bc81abb2..a050b01e2 100644 --- a/package.nix +++ b/package.nix @@ -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;