From e1c5f9425d926e6308e4d1390540d80ecc3a77d7 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 13 Dec 2024 20:09:53 -0600 Subject: [PATCH] imp: nixpkgs 24.11, nix 2.25, nushell polars, breaking chg fixes --- flake.lock | 36 +++++++++++--------- flake.nix | 8 ++--- flake/nixosModules/profile-basic.nix | 8 ++--- flake/nixosModules/profile-cardano-smash.nix | 4 +-- flake/nixosModules/profile-common.nix | 1 - flakeModules/shell.nix | 11 +++--- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index d9b8528b..19a2e227 100644 --- a/flake.lock +++ b/flake.lock @@ -774,15 +774,16 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1732287300, - "narHash": "sha256-lURsE6HdJX0alscWhbzCWyLRK8GpAgKuXeIgX31Kfqg=", + "lastModified": 1734105428, + "narHash": "sha256-5StB/VhWHOj3zlBxshqVFa6cwAE0Mk/wxRo3eEfcy74=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "262cb2aec2ddd914124bab90b06fe24a1a74d02c", + "rev": "ef96685204b54f0a0fc1af3116418f74be295cfc", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "est-peers-40", "repo": "iohk-nix", "type": "github" } @@ -795,15 +796,16 @@ "sodium": "sodium_2" }, "locked": { - "lastModified": 1732287300, - "narHash": "sha256-lURsE6HdJX0alscWhbzCWyLRK8GpAgKuXeIgX31Kfqg=", + "lastModified": 1734105428, + "narHash": "sha256-5StB/VhWHOj3zlBxshqVFa6cwAE0Mk/wxRo3eEfcy74=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "262cb2aec2ddd914124bab90b06fe24a1a74d02c", + "rev": "ef96685204b54f0a0fc1af3116418f74be295cfc", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "est-peers-40", "repo": "iohk-nix", "type": "github" } @@ -890,16 +892,16 @@ "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1727313940, - "narHash": "sha256-mJJRmU4cLnIS3ByoWHsJCmoRroH3Oj6Gj6mKcdjJX8Y=", + "lastModified": 1733805479, + "narHash": "sha256-GFKV+bwye+Rj7G3JtJ/sljGLeN3A+jnVb71m84noheI=", "owner": "nixos", "repo": "nix", - "rev": "b23812a59c6854378f042e33f5e006c4d9dc516a", + "rev": "fe3c94d5c27c53c4b31f02c7be825d4acc67ab3c", "type": "github" }, "original": { "owner": "nixos", - "ref": "2.24-maintenance", + "ref": "2.25-maintenance", "repo": "nix", "type": "github" } @@ -1152,11 +1154,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { @@ -1248,16 +1250,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1717281328, - "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 8bc7aaf2..91d2e46e 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,8 @@ flake-parts.url = "github:hercules-ci/flake-parts"; inputs-check.url = "github:input-output-hk/inputs-check"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nix.url = "github:nixos/nix/2.24-maintenance"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nix.url = "github:nixos/nix/2.25-maintenance"; opentofu-registry = { url = "github:opentofu/registry"; flake = false; @@ -28,8 +28,8 @@ capkgs.url = "github:input-output-hk/capkgs"; empty-flake.url = "github:input-output-hk/empty-flake"; haskell-nix.url = "github:input-output-hk/haskell.nix"; - iohk-nix.url = "github:input-output-hk/iohk-nix"; - iohk-nix-ng.url = "github:input-output-hk/iohk-nix"; + iohk-nix.url = "github:input-output-hk/iohk-nix/est-peers-40"; + iohk-nix-ng.url = "github:input-output-hk/iohk-nix/est-peers-40"; # For tmp local faucet testing # cardano-faucet.url = "github:input-output-hk/cardano-faucet/jl/node-9.2"; diff --git a/flake/nixosModules/profile-basic.nix b/flake/nixosModules/profile-basic.nix index 311242e6..23b77f24 100644 --- a/flake/nixosModules/profile-basic.nix +++ b/flake/nixosModules/profile-basic.nix @@ -72,8 +72,8 @@ # For nix >= 2.24 build compatibility inputs.nixpkgs-unstable.legacyPackages.${system}.neovim ncdu - # Add a localFlake pin to avoid downstream repo nixpkgs pins <= 23.05 causing a non-existent pkg failure - inputs.nixpkgs.legacyPackages.${system}.nushellFull + # Add a localFlake pin to avoid downstream repo nixpkgs pins <= 24.11 causing missing features error + inputs.nixpkgs.legacyPackages.${system}.nushell parted pciutils procps @@ -89,10 +89,6 @@ ]; programs = { - # Added to address openssh CVE-2024-6387 - # Remove on the next nixpkgs major version update so openssh 9.8p1+ version is maintained - ssh.package = inputs.nixpkgs-unstable.legacyPackages.${system}.openssh; - tmux = { enable = true; aggressiveResize = true; diff --git a/flake/nixosModules/profile-cardano-smash.nix b/flake/nixosModules/profile-cardano-smash.nix index ea0f4ce3..c006ecf6 100644 --- a/flake/nixosModules/profile-cardano-smash.nix +++ b/flake/nixosModules/profile-cardano-smash.nix @@ -409,7 +409,7 @@ flake: { startLimitIntervalSec = 0; serviceConfig = { User = "registered-relays-dump"; - SupplementaryGroups = "cardano-node"; + SupplementaryGroups = ["cardano-node"]; StateDirectory = "registered-relays-dump"; Restart = "always"; RestartSec = "30s"; @@ -602,7 +602,7 @@ flake: { systemd.services.nginx.serviceConfig = { LimitNOFILE = 65535; LogNamespace = "nginx"; - SupplementaryGroups = "registered-relays-dump"; + SupplementaryGroups = ["registered-relays-dump"]; }; services.prometheus.exporters = { diff --git a/flake/nixosModules/profile-common.nix b/flake/nixosModules/profile-common.nix index cd76d923..8b690de6 100644 --- a/flake/nixosModules/profile-common.nix +++ b/flake/nixosModules/profile-common.nix @@ -28,7 +28,6 @@ imports = [ inputs.sops-nix.nixosModules.default inputs.auth-keys-hub.nixosModules.auth-keys-hub - (inputs.nixpkgs-unstable.outPath + "/nixos/modules/services/monitoring/alloy.nix") ]; programs = { diff --git a/flakeModules/shell.nix b/flakeModules/shell.nix index 8e99b72e..4cf7a00c 100644 --- a/flakeModules/shell.nix +++ b/flakeModules/shell.nix @@ -257,8 +257,9 @@ in localFlake.inputs.nixpkgs.legacyPackages.${system}.jq just moreutils - # Add a localFlake pin to avoid downstream repo nixpkgs pins <= 23.05 causing a non-existent pkg failure - localFlake.inputs.nixpkgs.legacyPackages.${system}.nushellFull + # Add a localFlake pin to avoid downstream repo nixpkgs pins <= 23.05 causing a missing features failure + localFlake.inputs.nixpkgs.legacyPackages.${system}.nushell + localFlake.inputs.nixpkgs.legacyPackages.${system}.nushellPlugins.polars patch ripgrep statix @@ -287,8 +288,7 @@ in ++ (with pkgs; with cfgPkgs; [ b2sum - # Currently marked as broken in nixpkgs-23.11 and nixpkgs-unstable - # haskellPackages.cbor-tool + haskellPackages.cbor-tool bech32 cardano-address cardano-cli @@ -390,7 +390,7 @@ in (pkgs.writeShellApplication { name = "menu-${id}"; - runtimeInputs = [localFlake.inputs.nixpkgs.legacyPackages.${system}.nushellFull]; + runtimeInputs = [localFlake.inputs.nixpkgs.legacyPackages.${system}.nushell]; text = let minWidth = @@ -449,6 +449,7 @@ in selectScope id optionalString "enableHooks" "defaultHooks" + selectScope id optionalAttrs "enableFormatter" "defaultFormatterHook" + '' + export NUSHELL_PLUGINS_POLARS="${getExe localFlake.inputs.nixpkgs.legacyPackages.${system}.nushellPlugins.polars}" [ -z "$NOMENU" ] && menu ''; }