From 16985aed9a8a336578cba4af9ab755f35fab0980 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 8 May 2025 22:16:46 -0500 Subject: [PATCH 1/2] _1password-gui: move to by-name --- .../misc/1password-gui => by-name/_1/_1password-gui}/darwin.nix | 0 .../misc/1password-gui => by-name/_1/_1password-gui}/linux.nix | 0 .../default.nix => by-name/_1/_1password-gui/package.nix} | 0 .../1password-gui => by-name/_1/_1password-gui}/sources.json | 0 .../misc/1password-gui => by-name/_1/_1password-gui}/update.sh | 0 .../1password-gui => by-name/_1/_1password-gui}/versions.json | 0 pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 2 deletions(-) rename pkgs/{applications/misc/1password-gui => by-name/_1/_1password-gui}/darwin.nix (100%) rename pkgs/{applications/misc/1password-gui => by-name/_1/_1password-gui}/linux.nix (100%) rename pkgs/{applications/misc/1password-gui/default.nix => by-name/_1/_1password-gui/package.nix} (100%) rename pkgs/{applications/misc/1password-gui => by-name/_1/_1password-gui}/sources.json (100%) rename pkgs/{applications/misc/1password-gui => by-name/_1/_1password-gui}/update.sh (100%) rename pkgs/{applications/misc/1password-gui => by-name/_1/_1password-gui}/versions.json (100%) diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/by-name/_1/_1password-gui/darwin.nix similarity index 100% rename from pkgs/applications/misc/1password-gui/darwin.nix rename to pkgs/by-name/_1/_1password-gui/darwin.nix diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/by-name/_1/_1password-gui/linux.nix similarity index 100% rename from pkgs/applications/misc/1password-gui/linux.nix rename to pkgs/by-name/_1/_1password-gui/linux.nix diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/by-name/_1/_1password-gui/package.nix similarity index 100% rename from pkgs/applications/misc/1password-gui/default.nix rename to pkgs/by-name/_1/_1password-gui/package.nix diff --git a/pkgs/applications/misc/1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json similarity index 100% rename from pkgs/applications/misc/1password-gui/sources.json rename to pkgs/by-name/_1/_1password-gui/sources.json diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/by-name/_1/_1password-gui/update.sh similarity index 100% rename from pkgs/applications/misc/1password-gui/update.sh rename to pkgs/by-name/_1/_1password-gui/update.sh diff --git a/pkgs/applications/misc/1password-gui/versions.json b/pkgs/by-name/_1/_1password-gui/versions.json similarity index 100% rename from pkgs/applications/misc/1password-gui/versions.json rename to pkgs/by-name/_1/_1password-gui/versions.json diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aada23abf900..334b6458b0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1005,8 +1005,6 @@ with pkgs; _3llo = callPackage ../tools/misc/3llo { }; - _1password-gui = callPackage ../applications/misc/1password-gui { }; - _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; _7zz-rar = _7zz.override { enableUnfree = true; }; From 99512615523a82416a5988fc31c48a65030bd5a5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 8 May 2025 22:17:00 -0500 Subject: [PATCH 2/2] _1password-gui-beta: move to by-name --- pkgs/by-name/_1/_1password-gui-beta/package.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/_1/_1password-gui-beta/package.nix diff --git a/pkgs/by-name/_1/_1password-gui-beta/package.nix b/pkgs/by-name/_1/_1password-gui-beta/package.nix new file mode 100644 index 000000000000..9c95e4f99039 --- /dev/null +++ b/pkgs/by-name/_1/_1password-gui-beta/package.nix @@ -0,0 +1,4 @@ +{ _1password-gui }: +_1password-gui.override { + channel = "beta"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 334b6458b0eb..e71c2e9367ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1005,8 +1005,6 @@ with pkgs; _3llo = callPackage ../tools/misc/3llo { }; - _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; - _7zz-rar = _7zz.override { enableUnfree = true; }; acquire = with python3Packages; toPythonApplication acquire;