From 8bdc233bb4f79f61e1defada6756c3ba703d4c65 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:07:22 +1200 Subject: [PATCH 1/3] soju: migrate to pkgs/by-name --- .../networking/soju/default.nix => by-name/so/soju/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/soju/default.nix => by-name/so/soju/package.nix} (100%) diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/by-name/so/soju/package.nix similarity index 100% rename from pkgs/applications/networking/soju/default.nix rename to pkgs/by-name/so/soju/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3ec0b320ab5..26059dc282d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6194,8 +6194,6 @@ with pkgs; socklog = callPackage ../tools/system/socklog { }; - soju = callPackage ../applications/networking/soju { }; - spacevim = callPackage ../applications/editors/spacevim { }; srvc = callPackage ../applications/version-management/srvc { }; From ef5f78e7b8d75fbf6ad7c0d93e5253e04cd96064 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:07:54 +1200 Subject: [PATCH 2/3] soju: adopt --- pkgs/by-name/so/soju/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index f8d6e3044314..8d619ddbed3f 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -50,6 +50,6 @@ buildGoModule rec { homepage = "https://soju.im"; changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ azahi malte-v ]; + maintainers = with maintainers; [ azahi malte-v jtbx ]; }; } From 274e87e5fdfa1f9c7ec718a5594e2debb2a57c76 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 24 May 2024 09:31:52 +1200 Subject: [PATCH 3/3] soju: 0.7.0 -> 0.8.0 --- pkgs/by-name/so/soju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 8d619ddbed3f..ddc7cd5c2d2d 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "soju"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-nzaYa4h+UZcP6jqFHxVjgQ/F3q9aOeOPgVKFWBy6Fag="; + hash = "sha256-K7Dgc1HQ6+GnjraQNcK9LOFxUIoKKWro1mWKDZFwLiE="; }; - vendorHash = "sha256-JLght6bOrtc/VP3tfQboASa68VL2GGBTdK02DOC5EQk="; + vendorHash = "sha256-4Yl87Gk/HykjIyNpRfgthLf6b+v7kxmONIhYBWVXi0I="; nativeBuildInputs = [ installShellFiles