From 2c0ae7d44f0761100b03b02004cf141266094f22 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 21 Feb 2023 20:33:19 -0800
Subject: [PATCH] contrib: stop packaging rage

We don't need to package rage anymore, since all the latest maintained
versions of Nix have versions higher than what we need.
---
 modules/age.nix |  7 +------
 pkgs/rage.nix   | 49 -------------------------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 pkgs/rage.nix

diff --git a/modules/age.nix b/modules/age.nix
index d38e8de..8c99214 100644
--- a/modules/age.nix
+++ b/modules/age.nix
@@ -10,11 +10,6 @@ with lib; let
 
   isDarwin = lib.attrsets.hasAttrByPath ["environment" "darwinConfig"] options;
 
-  # we need at least rage 0.5.0 to support ssh keys
-  rage =
-    if lib.versionOlder pkgs.rage.version "0.5.0"
-    then pkgs.callPackage ../pkgs/rage.nix {}
-    else pkgs.rage;
   ageBin = config.age.ageBin;
 
   users = config.users.users;
@@ -187,7 +182,7 @@ in {
   options.age = {
     ageBin = mkOption {
       type = types.str;
-      default = "${rage}/bin/rage";
+      default = "${pkgs.rage}/bin/rage";
       description = ''
         The age executable to use.
       '';
diff --git a/pkgs/rage.nix b/pkgs/rage.nix
deleted file mode 100644
index 4db11e9..0000000
--- a/pkgs/rage.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  stdenv,
-  rustPlatform,
-  fetchFromGitHub,
-  installShellFiles,
-  darwin,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "rage";
-  version = "0.5.0";
-
-  src = fetchFromGitHub {
-    owner = "str4d";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc=";
-  };
-
-  cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs=";
-
-  nativeBuildInputs = [installShellFiles];
-
-  buildInputs = with darwin.apple_sdk.frameworks;
-    stdenv.lib.optionals stdenv.isDarwin [
-      Security
-      Foundation
-    ];
-
-  # cargo test has an x86-only dependency
-  doCheck = stdenv.hostPlatform.isx86;
-
-  postBuild = ''
-    cargo run --example generate-docs
-    cargo run --example generate-completions
-  '';
-
-  postInstall = ''
-    installManPage target/manpages/*
-    installShellCompletion target/completions/*.{bash,fish,zsh}
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
-    homepage = "https://github.com/str4d/rage";
-    changelog = "https://github.com/str4d/rage/releases/tag/v${version}";
-    license = with licenses; [asl20 mit]; # either at your option
-    maintainers = with maintainers; [marsam ryantm];
-  };
-}