From f789a362e0cfff7f9190cd176c5e65d976ec6ed7 Mon Sep 17 00:00:00 2001 From: TheSola10 Date: Thu, 16 May 2024 16:50:44 +0200 Subject: [PATCH 1/2] harmonia: migrate to by-name --- .../harmonia/default.nix => by-name/ha/harmonia/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/package-management/harmonia/default.nix => by-name/ha/harmonia/package.nix} (100%) diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/by-name/ha/harmonia/package.nix similarity index 100% rename from pkgs/tools/package-management/harmonia/default.nix rename to pkgs/by-name/ha/harmonia/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..dc586c5deca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8901,8 +8901,6 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; - harmonia = callPackage ../tools/package-management/harmonia { }; - hayagriva = callPackage ../tools/typesetting/hayagriva { }; hcl2json = callPackage ../applications/misc/hcl2json { }; From 5a1dff9e7506d133518ed481580b20efdf220507 Mon Sep 17 00:00:00 2001 From: TheSola10 Date: Thu, 16 May 2024 16:51:53 +0200 Subject: [PATCH 2/2] harmonia: 0.7.5 -> 0.8.0 --- pkgs/by-name/ha/harmonia/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index 8e174cf68a89..a8f4c4b09d6b 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -12,16 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-QqRq5maYk4hDl0MXkj9wOPWUta5b+kXG9e/kqRorNE4="; + hash = "sha256-+V0V/l9Q7HR3J0aH1UWc1qHrpGiRWd6B4R+3MECFORg="; }; - cargoHash = "sha256-dlmSn4cWU6RqEiUoQYNJFhxu3owplkxlbtszBxm+GbU="; + cargoHash = "sha256-3Nx1YXjbYVOD7pYgI9Cp5Vsxv1j1XeX6pCl4+Q1OtVs="; + + doCheck = false; nativeBuildInputs = [ pkg-config nixVersions.nix_2_21