From d6496a13efd317a41ab795e1abecfeb850e42db4 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 17 Sep 2022 15:39:20 +0300
Subject: [PATCH] rr-unstable: remove

---
 .../tools/analysis/rr/unstable.nix            | 22 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/rr/unstable.nix

diff --git a/pkgs/development/tools/analysis/rr/unstable.nix b/pkgs/development/tools/analysis/rr/unstable.nix
deleted file mode 100644
index 8ffdbc88e4dd..000000000000
--- a/pkgs/development/tools/analysis/rr/unstable.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This is a temporary copy of the default.nix in this folder, with the version
-# updated to the current tip of rr's master branch. This exists because rr has
-# not had a release in a long time. Upstream has stated that it should be fine
-# to use master. This file, and its attribute in all-packages, can be removed
-# once rr makes a release.
-
-{ callPackage, fetchFromGitHub }:
-
-let
-  rr = callPackage ./. {};
-in
-
-  rr.overrideAttrs (old: {
-    version = "unstable-2022-05-12";
-
-    src = fetchFromGitHub {
-      owner = "mozilla";
-      repo = "rr";
-      rev = "c96cb688106634ad09af6214aa91252c3a4f74b1";
-      sha256 = "sha256-K4cEQnvBXr/j9qXCgIHLqMrRzm96ushTO5STivRj+Mk=";
-    };
-  })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6abfacc7d726..84947c0a1eea 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1253,6 +1253,7 @@ mapAliases ({
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21
   rpiboot-unstable = rpiboot; # Added 2021-07-30
+  rr-unstable = rr; # Added 2022-09-17
   rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22
   rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25
   rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c30e5a9a8db6..4922d60a9a03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17115,7 +17115,6 @@ with pkgs;
   rolespec = callPackage ../development/tools/misc/rolespec { };
 
   rr = callPackage ../development/tools/analysis/rr { };
-  rr-unstable = callPackage ../development/tools/analysis/rr/unstable.nix { }; # This is a temporary attribute, please see the corresponding file for details.
 
   rufo = callPackage ../development/tools/rufo { };