From e54c1b70b63d3139c2204ea03c54e15037d55d1a Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 17 Dec 2024 20:01:14 +0900 Subject: [PATCH] edgedb: 6.0.2 -> 6.1.0; migrate to pkgs/by-name diff: https://github.com/edgedb/edgedb-cli/compare/v6.0.2...v6.1.0 Signed-off-by: misilelab --- .../ed}/edgedb/0001-dynamically-patchelf-binaries.patch | 0 .../edgedb/default.nix => by-name/ed/edgedb/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{tools/networking => by-name/ed}/edgedb/0001-dynamically-patchelf-binaries.patch (100%) rename pkgs/{tools/networking/edgedb/default.nix => by-name/ed/edgedb/package.nix} (90%) diff --git a/pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch similarity index 100% rename from pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch rename to pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/by-name/ed/edgedb/package.nix similarity index 90% rename from pkgs/tools/networking/edgedb/default.nix rename to pkgs/by-name/ed/edgedb/package.nix index e52c3b6dfc88..8d07257fdbcd 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/by-name/ed/edgedb/package.nix @@ -16,19 +16,19 @@ }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-P55LwByDVO3pEzg4OZldXiyli8s5oHvV8MXCDwkF2+8="; + hash = "sha256-iB0ZWciEx/Xiq+pMg3nMJNHumoy5Z8dB6ev7UneHnVg="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-oRtgORzp0tabPcyArPgG8LGfYlSPhpaeRPT9QWF5BGs="; + hash = "sha256-oiDCUJamnl2ykvfs7V20dvr29ZAtSl+kZW4fzmlc1Ao="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42f40a1b32b0..f1b5cedf1e3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -331,8 +331,6 @@ with pkgs; catch2 = catch2_3; }; - edgedb = callPackage ../tools/networking/edgedb { }; - eludris = callPackage ../tools/misc/eludris { }; enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };