Update to 7.1.61

shopstic · Jul 24, 2024 · ae67770 · ae67770
1 parent 78efd22
commit ae67770
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "FDB";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/249fbde2a178a2ea2638b65b9ecebd531b338cf9";
     flakeUtils.url = "github:numtide/flake-utils";
   };
 
@@ -69,7 +69,14 @@
           text = builtins.toJSON {
             "nix.enableLanguageServer" = true;
             "nix.formatterPath" = pkgs.nixpkgs-fmt + "/bin/nixpkgs-fmt";
-            "nix.serverPath" = pkgs.rnix-lsp + "/bin/rnix-lsp";
+            "nix.serverSettings" = {
+              "nil" = {
+                "formatting" = {
+                  "command" = [ "nixpkgs-fmt" ];
+                };
+              };
+            };
+            "nix.serverPath" = pkgs.nil + "/bin/nil";
           };
         };
       in

diff --git a/nix/7.x/aarch64-darwin.nix b/nix/7.x/aarch64-darwin.nix
@@ -7,16 +7,16 @@
 , cpio
 }:
 let
-  version = "7.1.57";
+  version = "7.1.61";
   installer = fetchurl {
     name = "foundationdb-installer-${version}";
     url = "https://github.com/apple/foundationdb/releases/download/${version}/FoundationDB-${version}_arm64.pkg";
-    sha256 = "sha256-YmXEuuMMC5ZyJbfmHtgaZT6TKC3mh7P3v3rDFOIKsFU=";
+    sha256 = "sha256-uPPJm4U+6C/9qgq/fnwUIiML6Khi/LoosOD14VVRA7s=";
   };
   jar = fetchurl {
     name = "foundationdb-jar-${version}";
     url = "https://repo1.maven.org/maven2/org/foundationdb/fdb-java/${version}/fdb-java-${version}.jar";
-    sha256 = "sha256-Ip+eFIYeTchp0JQwDo4OAu+XMv4AjvINxP0be0XHLZk=";
+    sha256 = "sha256-jr3HruziJMxqTtvqbEtKx7VZZ/OHqxJAyXU/Sg87JaA=";
   };
 in
 runCommand "foundationdb-${version}"

diff --git a/nix/7.x/linux.nix b/nix/7.x/linux.nix
@@ -18,8 +18,8 @@
 , jemalloc
 , glibc
 , removeReferencesTo
-, version ? "7.1.57"
-, sha256 ? "sha256-Z56SmqM3a7FM89WR/8npB3BIyE7xt2eeXZrV3fgYNic="
+, version ? "7.1.61"
+, sha256 ? "sha256-D+jlhhAmTZx2n84L+TxiVjiSXP5aWeZDbosEp4m2xas="
 }:
 let
   src = fetchFromGitHub {