Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 8 insertions, 10 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix
index e87cecbf8fd3..bdca893a136c 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/bees/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }:
+{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }:
 
 let
 
-  version = "0.6.2";
-  sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib";
-
-  bees = stdenv.mkDerivation {
+  bees = stdenv.mkDerivation rec {
     pname = "bees";
-    inherit version;
+    version = "0.6.3";
 
     src = fetchFromGitHub {
       owner = "Zygo";
       repo = "bees";
       rev = "v${version}";
-      inherit sha256;
+      sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
     };
 
     buildInputs = [
       btrfs-progs               # for btrfs/ioctl.h
-      utillinux                 # for uuid.h
+      util-linux                 # for uuid.h
     ];
 
     nativeBuildInputs = [
@@ -58,8 +55,9 @@ let
 
 in
 
-runCommand "bees-service-${version}" {
-  inherit bash bees coreutils utillinux;
+runCommand "bees-service" {
+  inherit bash bees coreutils;
+  utillinux = util-linux; # needs to be a valid shell variable name
   btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
 } ''
   mkdir -p -- "$out/bin"