Loading maintainers/maintainer-list.nix +6 −0 Original line number Diff line number Diff line Loading @@ -3533,6 +3533,12 @@ fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; }]; }; davisrichard437 = { email = "davisrichard437@gmail.com"; github = "davisrichard437"; githubId = 85075437; name = "Richard Davis"; }; davorb = { email = "davor@davor.se"; github = "davorb"; Loading nixos/modules/services/x11/desktop-managers/pantheon.nix +1 −1 Original line number Diff line number Diff line Loading @@ -288,7 +288,7 @@ in elementary-music elementary-photos elementary-screenshot # elementary-tasks elementary-tasks elementary-terminal elementary-videos epiphany Loading pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch 0 → 100644 +25 −0 Original line number Diff line number Diff line From a4822ee9e894f5f5b3110f41f65a698dd845a41d Mon Sep 17 00:00:00 2001 From: Richard Davis <davisrichard437@gmail.com> Date: Fri, 24 Mar 2023 11:45:23 -0400 Subject: [PATCH] Changing paths to be nix-compatible. --- dist/desktop/gscreenshot.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/desktop/gscreenshot.desktop b/dist/desktop/gscreenshot.desktop index a5d2bcd..9d289e2 100644 --- a/dist/desktop/gscreenshot.desktop +++ b/dist/desktop/gscreenshot.desktop @@ -2,7 +2,7 @@ Type=Application Name=gscreenshot Comment=A simple screenshot utility -TryExec=/usr/bin/gscreenshot +TryExec=gscreenshot Exec=gscreenshot Icon=gscreenshot Categories=Graphics; -- 2.39.2 pkgs/applications/graphics/gscreenshot/default.nix 0 → 100644 +90 −0 Original line number Diff line number Diff line { lib , fetchFromGitHub , python3Packages , gettext , gobject-introspection , gtk3 , wrapGAppsHook , xdg-utils , scrot , slop , xclip , grim , slurp , wl-clipboard , waylandSupport ? true , x11Support ? true }: python3Packages.buildPythonApplication rec { pname = "gscreenshot"; version = "3.4.0"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "v${version}"; sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM="; }; # needed for wrapGAppsHook to function strictDeps = false; # tests require a display and fail doCheck = false; nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ gettext gobject-introspection gtk3 xdg-utils ] ++ lib.optionals waylandSupport [ # wayland deps grim slurp wl-clipboard ] ++ lib.optionals x11Support [ # X11 deps scrot slop xclip python3Packages.xlib ] ++ (with python3Packages; [ pillow pygobject3 setuptools ]); patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ]; meta = { description = "A screenshot frontend (CLI and GUI) for a variety of screenshot backends"; longDescription = '' gscreenshot provides a common frontend and expanded functionality to a number of X11 and Wayland screenshot and region selection utilties. In a nutshell, gscreenshot supports the following: - Capturing a full-screen screenshot - Capturing a region of the screen interactively - Capturing a window interactively - Capturing the cursor - Capturing the cursor, using an alternate cursor glyph - Capturing a screenshot with a delay - Showing a notification when a screenshot is taken - Capturing a screenshot from the command line or a custom script - Capturing a screenshot using a GUI - Saving to a variety of image formats including 'bmp', 'eps', 'gif', 'jpeg', 'pcx', 'pdf', 'ppm', 'tiff', 'png', and 'webp'. - Copying a screenshot to the system clipboard - Opening a screenshot in the configured application after capture Other than region selection, gscreenshot's CLI is non-interactive and is suitable for use in scripts. ''; homepage = "https://github.com/thenaterhood/gscreenshot"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.davisrichard437 ]; }; } pkgs/applications/networking/blocky/default.nix +5 −5 Original line number Diff line number Diff line Loading @@ -6,23 +6,25 @@ buildGoModule rec { pname = "blocky"; version = "0.20"; version = "0.21"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; sha256 = "sha256-l2GhqJit/+WpNDICD/NUzCAGrKrTNHzEzgpF9k3+DLk="; sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; vendorSha256 = "sha256-CS8+tsE5dptG9gF46OFoJGzn1FnfjekXLTLrpwIQdFQ="; vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A="; ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ]; passthru.tests = { inherit (nixosTests) blocky; }; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; homepage = "https://0xerr0r.github.io/blocky"; Loading @@ -30,6 +32,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ratsclub ]; }; passthru.tests = { inherit (nixosTests) blocky; }; } Loading
maintainers/maintainer-list.nix +6 −0 Original line number Diff line number Diff line Loading @@ -3533,6 +3533,12 @@ fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; }]; }; davisrichard437 = { email = "davisrichard437@gmail.com"; github = "davisrichard437"; githubId = 85075437; name = "Richard Davis"; }; davorb = { email = "davor@davor.se"; github = "davorb"; Loading
nixos/modules/services/x11/desktop-managers/pantheon.nix +1 −1 Original line number Diff line number Diff line Loading @@ -288,7 +288,7 @@ in elementary-music elementary-photos elementary-screenshot # elementary-tasks elementary-tasks elementary-terminal elementary-videos epiphany Loading
pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch 0 → 100644 +25 −0 Original line number Diff line number Diff line From a4822ee9e894f5f5b3110f41f65a698dd845a41d Mon Sep 17 00:00:00 2001 From: Richard Davis <davisrichard437@gmail.com> Date: Fri, 24 Mar 2023 11:45:23 -0400 Subject: [PATCH] Changing paths to be nix-compatible. --- dist/desktop/gscreenshot.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/desktop/gscreenshot.desktop b/dist/desktop/gscreenshot.desktop index a5d2bcd..9d289e2 100644 --- a/dist/desktop/gscreenshot.desktop +++ b/dist/desktop/gscreenshot.desktop @@ -2,7 +2,7 @@ Type=Application Name=gscreenshot Comment=A simple screenshot utility -TryExec=/usr/bin/gscreenshot +TryExec=gscreenshot Exec=gscreenshot Icon=gscreenshot Categories=Graphics; -- 2.39.2
pkgs/applications/graphics/gscreenshot/default.nix 0 → 100644 +90 −0 Original line number Diff line number Diff line { lib , fetchFromGitHub , python3Packages , gettext , gobject-introspection , gtk3 , wrapGAppsHook , xdg-utils , scrot , slop , xclip , grim , slurp , wl-clipboard , waylandSupport ? true , x11Support ? true }: python3Packages.buildPythonApplication rec { pname = "gscreenshot"; version = "3.4.0"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "v${version}"; sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM="; }; # needed for wrapGAppsHook to function strictDeps = false; # tests require a display and fail doCheck = false; nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ gettext gobject-introspection gtk3 xdg-utils ] ++ lib.optionals waylandSupport [ # wayland deps grim slurp wl-clipboard ] ++ lib.optionals x11Support [ # X11 deps scrot slop xclip python3Packages.xlib ] ++ (with python3Packages; [ pillow pygobject3 setuptools ]); patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ]; meta = { description = "A screenshot frontend (CLI and GUI) for a variety of screenshot backends"; longDescription = '' gscreenshot provides a common frontend and expanded functionality to a number of X11 and Wayland screenshot and region selection utilties. In a nutshell, gscreenshot supports the following: - Capturing a full-screen screenshot - Capturing a region of the screen interactively - Capturing a window interactively - Capturing the cursor - Capturing the cursor, using an alternate cursor glyph - Capturing a screenshot with a delay - Showing a notification when a screenshot is taken - Capturing a screenshot from the command line or a custom script - Capturing a screenshot using a GUI - Saving to a variety of image formats including 'bmp', 'eps', 'gif', 'jpeg', 'pcx', 'pdf', 'ppm', 'tiff', 'png', and 'webp'. - Copying a screenshot to the system clipboard - Opening a screenshot in the configured application after capture Other than region selection, gscreenshot's CLI is non-interactive and is suitable for use in scripts. ''; homepage = "https://github.com/thenaterhood/gscreenshot"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.davisrichard437 ]; }; }
pkgs/applications/networking/blocky/default.nix +5 −5 Original line number Diff line number Diff line Loading @@ -6,23 +6,25 @@ buildGoModule rec { pname = "blocky"; version = "0.20"; version = "0.21"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; sha256 = "sha256-l2GhqJit/+WpNDICD/NUzCAGrKrTNHzEzgpF9k3+DLk="; sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; vendorSha256 = "sha256-CS8+tsE5dptG9gF46OFoJGzn1FnfjekXLTLrpwIQdFQ="; vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A="; ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ]; passthru.tests = { inherit (nixosTests) blocky; }; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; homepage = "https://0xerr0r.github.io/blocky"; Loading @@ -30,6 +32,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ratsclub ]; }; passthru.tests = { inherit (nixosTests) blocky; }; }
![github-actions[bot]'s avatar](https://secure.gravatar.com/avatar/e7cd911927c7d1acf6281b69d385990d8fadcd26871048bbcdbff2e88da7f607?s=48&d=identicon "github-actions[bot]")