Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD

5 files changed, 68 insertions, 135 deletions

diff --git a/nixpkgs/pkgs/tools/X11/sxhkd/default.nix b/nixpkgs/pkgs/tools/X11/sxhkd/default.nix
deleted file mode 100644
index ab15c38168e2..000000000000
--- a/nixpkgs/pkgs/tools/X11/sxhkd/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, asciidoc
-, libxcb
-, xcbutil
-, xcbutilkeysyms
-, xcbutilwm
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "sxhkd";
-  version = "0.6.2";
-
-  src = fetchFromGitHub {
-    owner = "baskerville";
-    repo = "sxhkd";
-    rev = finalAttrs.version;
-    hash = "sha256-OelMqenk0tiWMLraekS/ggGf6IsXP7Sz7bv75NvnNvI=";
-  };
-
-  patches = [
-    (fetchpatch {
-      # Fixes an issue with overlapping chords when using multiple keyboard layouts.
-      name = "sxhkd-mod5.patch";
-      url = "https://github.com/baskerville/sxhkd/pull/307/commits/35e64f1d7b54c97ccc02e84e278012dae9bc3941.patch";
-      hash = "sha256-bvXWEEITbHC/h0nXQx99SXjvkI/KO36XXNSa1O8KSY0=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    asciidoc
-  ];
-
-  buildInputs = [
-    libxcb
-    xcbutil
-    xcbutilkeysyms
-    xcbutilwm
-  ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    description = "Simple X hotkey daemon";
-    homepage = "https://github.com/baskerville/sxhkd";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ vyp AndersonTorres ncfavier ];
-    platforms = platforms.linux;
-  };
-})
diff --git a/nixpkgs/pkgs/tools/X11/xosview/default.nix b/nixpkgs/pkgs/tools/X11/xosview/default.nix
deleted file mode 100644
index 3b09b150a0fc..000000000000
--- a/nixpkgs/pkgs/tools/X11/xosview/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, libX11
-, libXpm
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xosview";
-  version = "1.24";
-
-  src = fetchFromGitHub {
-    owner = "hills";
-    repo = finalAttrs.pname;
-    rev = finalAttrs.version;
-    hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw=";
-  };
-
-  dontConfigure = true;
-
-  buildInputs = [
-    libX11
-    libXpm
-  ];
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "PLATFORM=linux"
-  ];
-
-  meta = with lib; {
-    homepage = "http://www.pogo.org.uk/~mark/xosview/";
-    description = "A classic system monitoring tool";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; linux;
-  };
-})
-# TODO: generalize to other platforms
diff --git a/nixpkgs/pkgs/tools/X11/xosview2/default.nix b/nixpkgs/pkgs/tools/X11/xosview2/default.nix
deleted file mode 100644
index bd4234bae190..000000000000
--- a/nixpkgs/pkgs/tools/X11/xosview2/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, libX11
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xosview2";
-  version = "2.3.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/xosview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ex1GDBgx9Zzx5tOkZ2IRYskmBh/bUYpRTXHWRoE30vA=";
-  };
-
-  buildInputs = [ libX11 ];
-
-  meta = with lib; {
-    homepage = "https://xosview.sourceforge.net/index.html";
-    description = "Lightweight graphical operating system monitor";
-    longDescription = ''
-      xosview is a lightweight program that gathers information from your
-      operating system and displays it in graphical form. It attempts to show
-      you in a quick glance an overview of how your system resources are being
-      utilized.
-
-      It can be configured to be nothing more than a small strip showing a
-      couple of parameters on a desktop task bar. Or it can display dozens of
-      meters and rolling graphical charts over your entire screen.
-
-      Since xosview renders all graphics with core X11 drawing methods, you can
-      run it on one machine and display it on another. This works even if your
-      other host is an operating system not running an X server inside a
-      virtual machine running on a physically different host. If you can
-      connect to it on a network, then you can popup an xosview instance and
-      monitor what is going on.
-    '';
-    license = with licenses; [ gpl2 bsdOriginal ];
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.all;
-  };
-})
diff --git a/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix
index fdb3b7c58a56..ec8a2ed459d3 100644
--- a/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xprintidle-ng/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq";
   };
 
+  patches = [
+    ./fix-config_h-includes-should-be-first.patch
+  ];
+
   postPatch = ''
     substituteInPlace configure.ac \
       --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])"
@@ -59,8 +63,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A command-line tool to print idle time from libXss";
-    homepage = "http://taktoa.me/xprintidle-ng/";
-    license = lib.licenses.gpl2;
+    homepage = "https://github.com/taktoa/xprintidle-ng";
+    license = lib.licenses.gpl2Only;
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch b/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch
new file mode 100644
index 000000000000..01b4b5d63bdd
--- /dev/null
+++ b/nixpkgs/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch
@@ -0,0 +1,62 @@
+Fixes the config.h include error during build:
+
+```console
+In file included from src/xprintidle-ng.c:36:
+lib/time.h:28:3: error: #error "Please include config.h first."
+    28 |  #error "Please include config.h first."
+      |   ^~~~~
+```
+
+Introduced since gnulib upgrade:
+* https://github.com/coreutils/gnulib/commit/8ad7bc6
+* https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00088.html
+* https://www.gnu.org/software/gnulib/manual/html_node/Source-changes.html
+
+The last version of gnulib now checks that config.h is the first include
+in every compilation unit.
+
+This is not the case with the xprintidle-ng source code, so this patch
+moves these `config.h` inclusions to be first.
+
+---
+ src/time-format.c   | 2 +-
+ src/xprintidle-ng.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/time-format.c b/src/time-format.c
+index 3a46749..4c0a4d2 100644
+--- a/src/time-format.c
++++ b/src/time-format.c
+@@ -18,10 +18,10 @@
+ //     51 Franklin Street, Fifth Floor
+ //     Boston, MA 02110-1301, USA.
+
++#include <config.h>
+ #include <stdbool.h>
+ #include <signal.h>
+ #include <time.h>
+-#include <config.h>
+ #include "system.h"
+ #include "xalloc.h"
+
+diff --git a/src/xprintidle-ng.c b/src/xprintidle-ng.c
+index 5156adf..ca69b2d 100644
+--- a/src/xprintidle-ng.c
++++ b/src/xprintidle-ng.c
+@@ -28,13 +28,13 @@
+ // Eivind Magnus Hvidevold <hvidevold@gmail.com>.
+ // kpowersave is licensed under the GNU GPL, version 2 _only_.
+
++#include <config.h>
+ #include <X11/Xlib.h>
+ #include <X11/extensions/dpms.h>
+ #include <X11/extensions/scrnsaver.h>
+ #include <stdbool.h>
+ #include <signal.h>
+ #include <time.h>
+-#include <config.h>
+ #include "system.h"
+ #include "errno.h"
+ #include "error.h"
+--
+2.42.0