diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/by-name/gu/gummy/package.nix similarity index 82% rename from pkgs/tools/misc/gummy/default.nix rename to pkgs/by-name/gu/gummy/package.nix index 628d5e9e7d16..2b34d02d5b0a 100644 --- a/pkgs/tools/misc/gummy/default.nix +++ b/pkgs/by-name/gu/gummy/package.nix @@ -14,18 +14,19 @@ , fmt , nlohmann_json , spdlog +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "gummy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fusco"; repo = "gummy"; rev = finalAttrs.version; - hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; + hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ="; }; nativeBuildInputs = [ @@ -46,8 +47,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DUDEV_DIR=${placeholder "out"}/lib/udev" - "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + (lib.mapAttrsToList lib.cmakeFeature { + "UDEV_DIR" = "${placeholder "out"}/lib/udev"; + "UDEV_RULES_DIR" = "${placeholder "out"}/lib/udev/rules.d"; + }) ]; # Fixes the "gummy start" command, without this it cannot find the binary. @@ -65,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://codeberg.org/fusco/gummy"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35c7bab115ba..7ef5d30b80d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37080,8 +37080,6 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gummy = callPackage ../tools/misc/gummy { }; - hashpump = callPackage ../tools/misc/hashpump { }; hck = callPackage ../tools/text/hck { };