From 69d03945f1027df7fc8d9d27a8be9d71712584f0 Mon Sep 17 00:00:00 2001
From: V <v@unfathomable.blue>
Date: Thu, 2 Jun 2022 18:44:20 +0200
Subject: fleet: upgrade to NixOS 22.05

Change-Id: Ie5542d079ee7b2de06e0faed52343905b3287b39
---
 fleet/pkgs/overlay.nix                             | 10 -----
 .../permission-warnings-only-when-necessary.patch  | 50 ----------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 fleet/pkgs/permission-warnings-only-when-necessary.patch

(limited to 'fleet/pkgs')

diff --git a/fleet/pkgs/overlay.nix b/fleet/pkgs/overlay.nix
index 49cc524..95330fa 100644
--- a/fleet/pkgs/overlay.nix
+++ b/fleet/pkgs/overlay.nix
@@ -10,16 +10,6 @@ final: prev: {
   public-inbox = final.perlPackages.callPackage ./public-inbox {};
   public-inbox-init-lite = final.callPackage ./public-inbox-init-lite {};
 
-  # Fixes bundler complaining loudly if $HOME is read-only or unset
-  # Taken from https://github.com/rubygems/rubygems/pull/4724
-  # This is here because the CGit about filter invokes Asciidoctor,
-  # which otherwise causes its log to fill with spurious error messages.
-  # Can be removed once Bundler 2.2.23 or above makes its way into stable.
-  bundler = prev.bundler.overrideAttrs ({ patches ? [], ... }: {
-    patches = patches ++ [ ./permission-warnings-only-when-necessary.patch ];
-    dontBuild = false;
-  });
-
   # Fixes archives having silly permissions due to Postfix messing with the umask
   mlmmj = prev.mlmmj.overrideAttrs ({ patches ? [], ... }: {
     patches = patches ++ [ ./group-readable-archives.patch ];
diff --git a/fleet/pkgs/permission-warnings-only-when-necessary.patch b/fleet/pkgs/permission-warnings-only-when-necessary.patch
deleted file mode 100644
index 4a557a5..0000000
--- a/fleet/pkgs/permission-warnings-only-when-necessary.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-SPDX-FileCopyrightText: David Rodríguez <deivid.rodriguez@riseup.net>
-SPDX-License-Identifier: MIT
---- a/lib/bundler.rb
-+++ b/lib/bundler.rb
-@@ -236,8 +236,9 @@ def user_home
-         end
- 
-         if warning
--          user_home = tmp_home_path(warning)
--          Bundler.ui.warn "#{warning}\nBundler will use `#{user_home}' as your home directory temporarily.\n"
-+          Bundler.ui.warn "#{warning}\n"
-+          user_home = tmp_home_path
-+          Bundler.ui.warn "Bundler will use `#{user_home}' as your home directory temporarily.\n"
-           user_home
-         else
-           Pathname.new(home)
-@@ -684,15 +685,13 @@ def configure_gem_home
-       Bundler.rubygems.clear_paths
-     end
- 
--    def tmp_home_path(warning)
-+    def tmp_home_path
-       Kernel.send(:require, "tmpdir")
-       SharedHelpers.filesystem_access(Dir.tmpdir) do
-         path = Bundler.tmp
-         at_exit { Bundler.rm_rf(path) }
-         path
-       end
--    rescue RuntimeError => e
--      raise e.exception("#{warning}\nBundler also failed to create a temporary home directory':\n#{e}")
-     end
- 
-     # @param env [Hash]
-
---- a/lib/bundler/settings.rb
-+++ b/lib/bundler/settings.rb
-@@ -428,12 +428,8 @@ def printable_value(value, key)
-     def global_config_file
-       if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
-         Pathname.new(ENV["BUNDLE_CONFIG"])
--      else
--        begin
--          Bundler.user_bundle_path("config")
--        rescue PermissionError, GenericSystemCallError
--          nil
--        end
-+      elsif Bundler.rubygems.user_home && !Bundler.rubygems.user_home.empty?
-+        Pathname.new(Bundler.rubygems.user_home).join(".bundle/config")
-       end
-     end
-- 
cgit 1.4.1