Nix bump - use mainly the latest nixpkgs version

.github/workflows/ci.dhall

@@ -36,7 +36,7 @@ in  { Nix =
           [ mk.GithubActions.Step::{
             , name = Some "Install npm packages"
             , run = Some
-                "sudo apt-get install git; cd web; npm install --legacy-peer-deps"
+                "sudo apt-get install git; cd web; npm ci --legacy-peer-deps"
             }
           , mk.GithubActions.Step::{
             , name = Some "Run NPM tests"

.github/workflows/mkCI.dhall

@@ -159,8 +159,8 @@ in  { GithubActions
           let init =
                 [ checkout-step
                 , GithubActions.Step::{
-                  , uses = Some "actions/setup-node@v2"
-                  , `with` = Some (toMap { node-version = "16.15" })
+                  , uses = Some "actions/setup-node@v4"
+                  , `with` = Some (toMap { node-version = "22" })
                   }
                 ]
 

.github/workflows/web.yaml

@@ -4,11 +4,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: "actions/checkout@v2.4.0"
-      - uses: "actions/setup-node@v2"
+      - uses: "actions/setup-node@v4"
         with:
-          node-version: '16.15'
+          node-version: '22'
       - name: Install npm packages
-        run: "sudo apt-get install git; cd web; npm install --legacy-peer-deps"
+        run: "sudo apt-get install git; cd web; npm ci --legacy-peer-deps"
       - name: Run NPM tests
         run: "cd web ; npm run test"
       - name: Run NPM format

flake.nix

@@ -23,17 +23,13 @@
 
   inputs = {
     nixpkgs.url =
-      "github:NixOS/nixpkgs/ed014c27f4d0ca772fb57d3b8985b772b0503bbd";
-    # Latest from https://github.com/NixOS/nixpkgs/tree/haskell-updates
-    latestnixpkgs.url =
       "github:NixOS/nixpkgs/d3780c92e64472e8f9aa54f7bbb0dd4483b98303";
   };
 
-  outputs = { self, nixpkgs, latestnixpkgs }:
+  outputs = { self, nixpkgs }:
     let
       legacy = import ./nix/default.nix {
         nixpkgsPath = nixpkgs;
-        latestnixpkgsPath = latestnixpkgs;
         self = self;
       };
     in {

nix/default.nix

@@ -1,7 +1,6 @@
-{ elasticsearch-port ? 19200, nixpkgsPath, latestnixpkgsPath, self }:
+{ elasticsearch-port ? 19200, nixpkgsPath, self }:
 let
   nixpkgsSrc = import nixpkgsPath;
-  latestnixpkgsSrc = import latestnixpkgsPath;
 
   rev = if self ? rev then
     self.rev
@@ -19,6 +18,17 @@ let
 
   };
 
+  # pull specific nixpkgs for Kibana 7.x support
+  pkgsForKibana7 = import (pkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    rev = "ed014c27f4d0ca772fb57d3b8985b772b0503bbd";
+    sha256 = "sha256-Jxyn3uXFr5LdZNNiippI/obtLXAVBM18uVfiKVP4j9Q=";
+  }) {
+    system = "x86_64-linux";
+    config.allowUnfree = true;
+  };
+
   # Add monocle and patch broken dependency to the haskell package set
   haskellExtend = hpFinal: hpPrev: {
     monocle = hpPrev.callCabal2nix "monocle" src { };
@@ -71,13 +81,12 @@ let
 
   # create the main package set without options
   pkgs = nixpkgsSrc { system = "x86_64-linux"; };
-  latestPkgs = latestnixpkgsSrc { system = "x86_64-linux"; };
   pkgsNonFree = nixpkgsSrc {
     system = "x86_64-linux";
     config.allowUnfree = true;
   };
   # final haskell set, see: https://github.com/NixOS/nixpkgs/issues/25887
-  hsPkgs = latestPkgs.haskellPackages.extend haskellExtend;
+  hsPkgs = pkgs.haskellPackages.extend haskellExtend;
 
   # manually adds build dependencies for benchmark and codegen that are not managed by cabal2nix
   addExtraDeps = drv:
@@ -157,7 +166,7 @@ in rec {
     exec ${elasticsearch}/bin/elasticsearch
   '';
   # DB Companion
-  kibana = pkgsNonFree.kibana7.overrideAttrs (old: rec {
+  kibana = pkgsForKibana7.kibana7.overrideAttrs (old: rec {
     version = "7.17.5";
     name = "kibana-${version}";
     src = pkgs.fetchurl {
@@ -407,7 +416,7 @@ in rec {
     };
     doCheck = false;
     # nativeBuildInputs = [ pkgs.protobuf ];
-    vendorSha256 = "1r0gjhv513174pbqf399vsrpx6zsmdlj48pzc5qh15k62ihy0h68";
+    vendorHash = "sha256:1r0gjhv513174pbqf399vsrpx6zsmdlj48pzc5qh15k62ihy0h68";
     subPackages = [ "./apps/protoc-gen-openapi" ];
   };
   protobuf-src = pkgs.protobuf.src;
@@ -571,7 +580,7 @@ in rec {
     packages = p: [ (addExtraDeps p.monocle) p.pretty-simple ];
 
     buildInputs = [
-      latestPkgs.just
+      pkgs.just
       hsPkgs.hlint
       hsPkgs.apply-refact
       hsPkgs.ghcid