From 9248259708bd6ade5e334a2cdfb29d2a20acb0dd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 3 Oct 2022 17:15:36 +0200
Subject: ...

---
 overlays/fast-cli.nix                 | 34 -----------------------------
 overlays/postfix-mta-sts-resolver.nix |  1 +
 overlays/urxvt/52-osc.pl              | 41 -----------------------------------
 overlays/urxvt/default.nix            | 21 ------------------
 overlays/worktime/default.nix         |  2 +-
 5 files changed, 2 insertions(+), 97 deletions(-)
 delete mode 100644 overlays/fast-cli.nix
 delete mode 100644 overlays/urxvt/52-osc.pl
 delete mode 100644 overlays/urxvt/default.nix

(limited to 'overlays')

diff --git a/overlays/fast-cli.nix b/overlays/fast-cli.nix
deleted file mode 100644
index a318eada..00000000
--- a/overlays/fast-cli.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ prev, sources, ... }: {
-  fast-cli = prev.buildGoModule rec {
-    pname = "fast-cli";
-
-    inherit (sources.fast-cli) version src;
-    vendorSha256 = "sha256-XM/5kUau0JBMxN0UpX6QNI31i8/+HNFvgFUFtlJsBh0=";
-
-    preBuild = let
-      goMod = prev.writeText "go.mod" ''
-        module github.com/gesquive/fast-cli
-
-        go 1.17
-
-        require (
-                github.com/dustin/go-humanize v0.0.0-20170228161531-259d2a102b87
-                github.com/fatih/color v1.4.1
-                github.com/gesquive/cli v0.2.0
-                github.com/inconshreveable/mousetrap v1.0.0
-                github.com/mattn/go-colorable v0.0.8-0.20170210172801-5411d3eea597
-                github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c
-                github.com/spf13/cobra v0.0.0-20170531045452-8d4ce3549a0b
-                github.com/spf13/pflag v1.0.0
-                golang.org/x/sys v0.0.0-20170213225739-e24f485414ae
-        )
-      '';
-    in ''
-      install -v -m 0644 ${goMod} ./go.mod
-    '';
-
-    ldflags = [
-      "-X main.version=${prev.lib.removePrefix "v" version}"
-    ];
-  };
-}
diff --git a/overlays/postfix-mta-sts-resolver.nix b/overlays/postfix-mta-sts-resolver.nix
index a06dace5..d8b1ff00 100644
--- a/overlays/postfix-mta-sts-resolver.nix
+++ b/overlays/postfix-mta-sts-resolver.nix
@@ -24,5 +24,6 @@
     ];
 
     _.pyparsing.buildInputs.add = with final.python310Packages; [ flit-core ];
+    _.idna.buildInputs.add = with final.python310Packages; [ flit-core ];
   };
 }
diff --git a/overlays/urxvt/52-osc.pl b/overlays/urxvt/52-osc.pl
deleted file mode 100644
index 3292e8c4..00000000
--- a/overlays/urxvt/52-osc.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-#! perl
-
-=head1 NAME
-
-52-osc - Implement OSC 32 ; Interact with X11 clipboard
-
-=head1 SYNOPSIS
-
-   urxvt -pe 52-osc
-
-=head1 DESCRIPTION
-
-This extension implements OSC 52 for interacting with system clipboard
-
-Most code stolen from:
-http://ailin.tucana.uberspace.de/static/nei/*/Code/urxvt/
-
-=cut
-
-use MIME::Base64;
-use Encode;
-
-sub on_osc_seq {
-    my ($term, $op, $args) = @_;
-    return () unless $op eq 52;
-
-    my ($clip, $data) = split ';', $args, 2;
-    if ($data eq '?') {
-        # my $data_free = $term->selection();
-        # Encode::_utf8_off($data_free); # XXX
-        # $term->tt_write("\e]52;$clip;".encode_base64($data_free, '')."\a");
-    }
-    else {
-        my $data_decoded = decode_base64($data);
-        Encode::_utf8_on($data_decoded); # XXX
-        $term->selection($data_decoded, $clip =~ /c|^$/);
-        $term->selection_grab(urxvt::CurrentTime, $clip =~ /c|^$/);
-    }
-
-    ()
-}
diff --git a/overlays/urxvt/default.nix b/overlays/urxvt/default.nix
deleted file mode 100644
index 77a2c51f..00000000
--- a/overlays/urxvt/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ final, prev, ... }: {
-  rxvt_unicode-with-plugins = prev.rxvt-unicode.override {
-    configure = { availablePlugins, ... }: {
-        plugins = [ final.urxvt_osc_52 ] ++ builtins.attrValues availablePlugins;
-      };
-    };
-  urxvt_osc_52 = prev.stdenv.mkDerivation {
-    name = "rxvt_unicode-osc_52-0";
-    src = ./52-osc.pl;
-    unpackPhase = ''
-      cp $src 52-osc
-    '';
-    buildPhase = ''
-      sed -i 's|#! perl|#! ${final.perl}/bin/perl|g' 52-osc
-    '';
-    installPhase = ''
-      mkdir -p $out/lib/urxvt/perl
-      cp 52-osc $out/lib/urxvt/perl 
-    '';
-  };
-}
diff --git a/overlays/worktime/default.nix b/overlays/worktime/default.nix
index a8ee15e3..20c0b90f 100644
--- a/overlays/worktime/default.nix
+++ b/overlays/worktime/default.nix
@@ -5,7 +5,7 @@
 
     phases = [ "buildPhase" "checkPhase" "installPhase" ];
 
-    python = prev.python39.withPackages (ps: with ps; [pyxdg dateutil uritools requests configparser tabulate]);
+    python = prev.python39.withPackages (ps: with ps; [pyxdg python-dateutil uritools requests configparser tabulate]);
     buildInputs = [ python ];
 
     buildPhase = ''
-- 
cgit v1.2.3