From 09c5a08fb803a20b387754a773994f607b0ace0d Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 27 Apr 2024 17:21:50 +0000 Subject: [PATCH 1/4] xpointerbarrier: move to by-name --- .../default.nix => by-name/xp/xpointerbarrier/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/X11/xpointerbarrier/default.nix => by-name/xp/xpointerbarrier/package.nix} (100%) diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix similarity index 100% rename from pkgs/tools/X11/xpointerbarrier/default.nix rename to pkgs/by-name/xp/xpointerbarrier/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3e20bacd40b..833ab80fcfd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35937,8 +35937,6 @@ with pkgs; xplugd = callPackage ../tools/X11/xplugd { }; - xpointerbarrier = callPackage ../tools/X11/xpointerbarrier { }; - xkb-switch = callPackage ../tools/X11/xkb-switch { }; xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { }; From 929a74529d497cc6e28a2c0c6944944260f526a0 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 27 Apr 2024 17:34:03 +0000 Subject: [PATCH 2/4] xpointerbarrier: format with nixfmt --- pkgs/by-name/xp/xpointerbarrier/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xp/xpointerbarrier/package.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix index 8621e7644365..514859f107ae 100644 --- a/pkgs/by-name/xp/xpointerbarrier/package.nix +++ b/pkgs/by-name/xp/xpointerbarrier/package.nix @@ -1,4 +1,5 @@ -{ lib, +{ + lib, stdenv, fetchurl, pkg-config, @@ -16,9 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-V1sNAQjsPVSjJ2nhCSdZqZQA78pjUE0z3IU4+I85CpI="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -32,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.uninformativ.de/git/xpointerbarrier/file/README.html"; description = "Create X11 pointer barriers around your working area"; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres xzfc ]; + maintainers = with maintainers; [ + AndersonTorres + xzfc + ]; platforms = platforms.linux; mainProgram = "xpointerbarrier"; }; From b88eb9c642d44083434a06fee2dd08a54e838c19 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 27 Apr 2024 17:36:11 +0000 Subject: [PATCH 3/4] xpointerbarrier: add updateScript --- pkgs/by-name/xp/xpointerbarrier/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/xp/xpointerbarrier/package.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix index 514859f107ae..2665ceadc26c 100644 --- a/pkgs/by-name/xp/xpointerbarrier/package.nix +++ b/pkgs/by-name/xp/xpointerbarrier/package.nix @@ -6,6 +6,7 @@ libX11, libXfixes, libXrandr, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -27,6 +28,11 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=$(out)" ]; + passthru.updateScript = gitUpdater { + url = "https://www.uninformativ.de/git/xpointerbarrier.git/"; + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://www.uninformativ.de/git/xpointerbarrier/file/README.html"; description = "Create X11 pointer barriers around your working area"; From bb01cabd74e6067ec00a9cfc1a9a57a339fad7b8 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 27 Apr 2024 17:37:45 +0000 Subject: [PATCH 4/4] xpointerbarrier: 20.07 -> 23.08 --- pkgs/by-name/xp/xpointerbarrier/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xp/xpointerbarrier/package.nix b/pkgs/by-name/xp/xpointerbarrier/package.nix index 2665ceadc26c..06dc1c64b790 100644 --- a/pkgs/by-name/xp/xpointerbarrier/package.nix +++ b/pkgs/by-name/xp/xpointerbarrier/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xpointerbarrier"; - version = "20.07"; + version = "23.08"; src = fetchurl { url = "https://www.uninformativ.de/git/xpointerbarrier/archives/xpointerbarrier-v${finalAttrs.version}.tar.gz"; - hash = "sha256-V1sNAQjsPVSjJ2nhCSdZqZQA78pjUE0z3IU4+I85CpI="; + hash = "sha256-d0PcZ4z8JgN4ncPUGeJZwIV5vB7M0Jo7o1/L6mrJtUc="; }; nativeBuildInputs = [ pkg-config ];