diff options
| author | sterni <sternenseemann@systemli.org> | 2024-04-18T13·15+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-04-28T15·19+0000 |
| commit | 545eb0535702d2c8a66ff357972677a8765ade46 (patch) | |
| tree | 2d2ab2fb97805ad87337af03e5cb4ef4a1e652c5 | |
| parent | d816b18fa6a4e866add3bc6efc88c730ecfaae53 (diff) | |
refactor(3p): use josh from nixpkgs r/8023
The change we need has been released and propagated to nixos channels. Change-Id: Ib10a1d42d7ef6deaf5665a13b72ece345e83d7dc Reviewed-on: https://cl.tvl.fyi/c/depot/+/11457 Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
| -rw-r--r-- | ops/modules/josh.nix | 2 | ||||
| -rw-r--r-- | third_party/josh/default.nix | 49 | ||||
| -rw-r--r-- | tools/releases/default.nix | 2 | ||||
| -rw-r--r-- | users/tazjin/nixos/modules/physical.nix | 2 |
4 files changed, 3 insertions, 52 deletions
diff --git a/ops/modules/josh.nix b/ops/modules/josh.nix index 4591ebf0f0..3c37d0fec3 100644 --- a/ops/modules/josh.nix +++ b/ops/modules/josh.nix @@ -26,7 +26,7 @@ in DynamicUser = true; StateDirectory = "josh"; Restart = "always"; - ExecStart = "${depot.third_party.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/ --require-auth"; + ExecStart = "${pkgs.josh}/bin/josh-proxy --no-background --local /var/lib/josh --port ${toString cfg.port} --remote https://cl.tvl.fyi/ --require-auth"; }; }; }; diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix deleted file mode 100644 index 9750780d1f..0000000000 --- a/third_party/josh/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -# https://github.com/josh-project/josh -{ depot, pkgs, ... }: - -let - # TODO(sterni): switch to pkgs.josh as soon as that commit is released - rev = "1586eab06284ce668779c87f00a1fb5fa9763be0"; - src = pkgs.fetchFromGitHub { - owner = "josh-project"; - repo = "josh"; - inherit rev; - hash = "sha256-94QrHcVHiEMCpBZJ5sghwtVNLNm4gdG8X85OetoGRD0="; - }; - - - naersk = pkgs.callPackage depot.third_party.sources.naersk { - inherit (pkgs) rustc cargo; - }; - version = "git-${builtins.substring 0 8 rev}"; -in -naersk.buildPackage { - pname = "josh"; - inherit src version; - JOSH_VERSION = version; - - buildInputs = with pkgs; [ - libgit2 - openssl - pkg-config - ]; - - dontStrip = true; - cargoBuildOptions = x: x ++ [ - "-p" - "josh-filter" - "-p" - "josh-proxy" - ]; - - overrideMain = x: { - preBuild = x.preBuild or "" + '' - echo 'debug = true' >> Cargo.toml - ''; - - nativeBuildInputs = (x.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/josh-proxy --prefix PATH : "${pkgs.git}/bin" - ''; - }; -} diff --git a/tools/releases/default.nix b/tools/releases/default.nix index d38ca0b5d8..0df07bbc9c 100644 --- a/tools/releases/default.nix +++ b/tools/releases/default.nix @@ -17,7 +17,7 @@ in command = pkgs.writeShellScript "${sanitizeDerivationName filter}-push" '' set -e - export PATH="${makeBinPath [ pkgs.git depot.third_party.josh ]}:$PATH" + export PATH="${makeBinPath [ pkgs.git pkgs.josh ]}:$PATH" echo 'Filtering depot through ${filter}' josh-filter '${filter}' diff --git a/users/tazjin/nixos/modules/physical.nix b/users/tazjin/nixos/modules/physical.nix index 6d48a076bf..bb85c6fb98 100644 --- a/users/tazjin/nixos/modules/physical.nix +++ b/users/tazjin/nixos/modules/physical.nix @@ -24,7 +24,6 @@ in users.tazjin.chase-geese config.tazjin.emacs third_party.agenix.cli - third_party.josh ]) ++ # programs from nixpkgs @@ -50,6 +49,7 @@ in hyperfine iftop imagemagick + josh jq lieer maim |