imp: nixpkgs 24.11, nix 2.25, nushell polars, breaking chg fixes

input-output-hk · Dec 14, 2024 · e1c5f94 · e1c5f94
1 parent f762a22
commit e1c5f94
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 35 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
                     '';
                 }