From c3c370a793f7b9ee1d254d66e81fafd29b53bdfa Mon Sep 17 00:00:00 2001 From: James Walker Date: Tue, 19 Mar 2024 15:25:31 -0400 Subject: [PATCH] bump fission server (#6) --- flake.lock | 153 +++++++++++++++++++++++++++++++++++++++++------------ flake.nix | 2 +- 2 files changed, 119 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 2625f15..4bf2d03 100644 --- a/flake.lock +++ b/flake.lock @@ -99,9 +99,28 @@ "type": "github" } }, + "command-utils": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1709702368, + "narHash": "sha256-1YOPubkJ5M6HigdfN0gn0AZ3kx6MHboG9UbWpYpk3gM=", + "owner": "expede", + "repo": "nix-command-utils", + "rev": "8f7179876383495b1f98311e53ebb41649ca270a", + "type": "github" + }, + "original": { + "owner": "expede", + "repo": "nix-command-utils", + "type": "github" + } + }, "crane": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1707685877, @@ -255,22 +274,24 @@ }, "fission-server": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "command-utils": "command-utils", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708019020, - "narHash": "sha256-LJQ7MjRgMi9e1/wpjiZcAXKQUV3hq4t/SALSwAefDOY=", + "lastModified": 1710790309, + "narHash": "sha256-Kgk/pqe0gvc34up4JOyXVWkJ3yFABFo0GF+xjJorxl8=", "owner": "fission-codes", "repo": "fission-server", - "rev": "394de877fad021260c69fdb1edd7bb4b2f98108c", + "rev": "b5f7228f2efe09989665dac519acf8cc04887647", "type": "github" }, "original": { "owner": "fission-codes", "repo": "fission-server", - "rev": "394de877fad021260c69fdb1edd7bb4b2f98108c", + "rev": "b5f7228f2efe09989665dac519acf8cc04887647", "type": "github" } }, @@ -378,17 +399,16 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "id": "flake-utils", + "type": "indirect" } }, "flake-utils_3": { @@ -413,6 +433,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1709126324, "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", @@ -427,9 +465,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -445,7 +483,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -706,11 +744,11 @@ "inputs": { "fenix": "fenix", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixify": "nixify", "nixlib": "nixlib_3", "nixos-unstable": "nixos-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "wit-deps": "wit-deps" }, "locked": { @@ -965,7 +1003,7 @@ "advisory-db": "advisory-db", "crane": "crane", "fenix": "fenix_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "macos-sdk": "macos-sdk", "nix-filter": "nix-filter", "nix-log": "nix-log", @@ -996,10 +1034,10 @@ "inputs": { "crane": "crane_2", "fenix": "fenix_3", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nix-filter": "nix-filter_2", "nixlib": "nixlib", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1284,13 +1322,28 @@ "type": "github" } }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1709569716, + "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "617579a787259b9a6419492eaac670a5f7663917", "type": "github" }, "original": { @@ -1300,6 +1353,21 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1706925685, "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", @@ -1315,7 +1383,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1679577639, "narHash": "sha256-7u7bsNP0ApBnLgsHVROQ5ytoMqustmMVMgtaFS/P7EU=", @@ -1331,7 +1399,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1709309926, "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", @@ -1346,13 +1414,13 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1710283656, - "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -1384,9 +1452,9 @@ "fission": "fission", "fission-server": "fission-server", "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "homestar": "homestar", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" } }, "rust-analyzer-src": { @@ -1452,11 +1520,11 @@ ] }, "locked": { - "lastModified": 1707444620, - "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=", + "lastModified": 1710727870, + "narHash": "sha256-Ulsx+t4SnRmjMJx4eF2Li+3rBGYhZp0XNShVjIheCfg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071", + "rev": "a1b17cacfa7a6ed18f553a195a047f4e73e95da9", "type": "github" }, "original": { @@ -1614,6 +1682,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wit-deps": { "inputs": { "nix-log": "nix-log_2", diff --git a/flake.nix b/flake.nix index 4d64fff..2dec1e7 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ fission.url = "github:fission-codes/fission/walkah/haskell-nix"; homestar.url = "github:ipvm-wg/homestar/homestar-runtime-v0.3.0"; - fission-server.url = "github:fission-codes/fission-server/394de877fad021260c69fdb1edd7bb4b2f98108c"; + fission-server.url = "github:fission-codes/fission-server/b5f7228f2efe09989665dac519acf8cc04887647"; }; outputs = { self, nixpkgs, flake-utils, fission, homestar, fission-server, ... }: