From e9c4598ccba302fcc869f2f017796d1e43c6c378 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 22 Jan 2023 11:01:28 -0300 Subject: wallutils: 5.12.4 -> 5.12.5 Also, add myself as maintainer. --- .../000-add-nixos-dirs-to-default-wallpapers.patch | 26 +++++++++++++ pkgs/tools/graphics/wallutils/default.nix | 44 ++++++++++++++-------- ...ixOS-paths-to-DefaultWallpaperDirectories.patch | 26 ------------- 3 files changed, 55 insertions(+), 41 deletions(-) create mode 100644 pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch delete mode 100644 pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch (limited to 'pkgs/tools') diff --git a/pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch b/pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch new file mode 100644 index 0000000000000..77c55b35c96b4 --- /dev/null +++ b/pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch @@ -0,0 +1,26 @@ +From 2643b06889605e6096174fb48dcb64a49b252217 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Sun, 17 Nov 2019 20:30:08 +0100 +Subject: [PATCH] lscollection: Add NixOS paths to DefaultWallpaperDirectories + +--- + collections.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/collections.go b/collections.go +index be04d41..cc79c56 100644 +--- a/collections.go ++++ b/collections.go +@@ -22,6 +22,9 @@ const ( + + // DefaultWallpaperDirectories lists the default locations to look for wallpapers + var DefaultWallpaperDirectories = []string{ ++ "/run/current-system/sw/share/pixmaps", ++ "/run/current-system/sw/share/wallpapers", ++ "/run/current-system/sw/share/backgrounds", + "/usr/share/pixmaps", + "/usr/share/wallpapers", + "/usr/share/backgrounds", +-- +2.23.0 + diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 67c325eb26af9..6479dba2493fb 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,45 +1,58 @@ { lib , buildGoModule , fetchFromGitHub -, pkg-config -, wayland , libX11 -, xbitmaps , libXcursor , libXmu , libXpm , libheif +, pkg-config +, wayland +, xbitmaps }: buildGoModule rec { pname = "wallutils"; - version = "5.12.4"; + version = "5.12.5"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "sha256-NODG4Lw/7X1aoT+dDSWxWEbDX6EAQzzDJPwsWOLaJEM="; + hash = "sha256-qC+AF+NFXSrUZAYaiFPwvfZtsAGhKE4XFDOUcfXUAbM="; }; vendorSha256 = null; - patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; + patches = [ + ./000-add-nixos-dirs-to-default-wallpapers.patch + ]; excludedPackages = [ "./pkg/event/cmd" # Development tools ]; - ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ]; + buildInputs = [ + libX11 + libXcursor + libXmu + libXpm + libheif + wayland + xbitmaps + ]; + + ldflags = [ "-s" "-w" ]; preCheck = let skippedTests = [ - "TestClosest" # Requiring Wayland or X. - "TestNewSimpleEvent" # Blocking + "TestClosest" # Requiring Wayland or X "TestEveryMinute" # Blocking + "TestNewSimpleEvent" # Blocking ]; in '' export XDG_RUNTIME_DIR=`mktemp -d` @@ -47,11 +60,12 @@ buildGoModule rec { buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") ''; - meta = with lib; { + meta = { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.AndersonTorres ]; + inherit (wayland.meta) platforms; + badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch b/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch deleted file mode 100644 index 77c55b35c96b4..0000000000000 --- a/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2643b06889605e6096174fb48dcb64a49b252217 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Sun, 17 Nov 2019 20:30:08 +0100 -Subject: [PATCH] lscollection: Add NixOS paths to DefaultWallpaperDirectories - ---- - collections.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/collections.go b/collections.go -index be04d41..cc79c56 100644 ---- a/collections.go -+++ b/collections.go -@@ -22,6 +22,9 @@ const ( - - // DefaultWallpaperDirectories lists the default locations to look for wallpapers - var DefaultWallpaperDirectories = []string{ -+ "/run/current-system/sw/share/pixmaps", -+ "/run/current-system/sw/share/wallpapers", -+ "/run/current-system/sw/share/backgrounds", - "/usr/share/pixmaps", - "/usr/share/wallpapers", - "/usr/share/backgrounds", --- -2.23.0 - -- cgit 1.4.1 From cb12769f62a868d3e12bbc59f14752145f2bda45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 13:30:41 +0000 Subject: ipxe: unstable-2022-04-06 -> unstable-2023-01-25 --- pkgs/tools/misc/ipxe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index c495e3455a29f..c3a0c5aa906d4 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2022-04-06"; + version = "unstable-2023-01-25"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "70995397e5bdfd3431e12971aa40630c7014785f"; - sha256 = "SrTNEYk13JXAcJuogm9fZ7CrzJIDRc0aziGdjRNv96I="; + rev = "4bffe0f0d9d0e1496ae5cfb7579e813277c29b0f"; + sha256 = "oDQBJz6KKV72DfhNEXjAZNeolufIUQwhroczCuYnGQA="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' -- cgit 1.4.1 From 51c748a0ef607205df511fc8c546b10b5dae1128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Jan 2023 14:13:40 +0000 Subject: advancecomp: 2.4 -> 2.5 --- pkgs/tools/compression/advancecomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 1ed5939746d41..32bae24a6c456 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "advancecomp"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - hash = "sha256-nl1t1XbyCDYH7jKdIRSIXfXuRCj5N+5noC86VpbpWu4="; + hash = "sha256-dlVTMd8sm84M8JZsCfVR/s4jXMQWmrVj7xwUVDsehQY="; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit 1.4.1 From 5946e103278c691f56ed585f2218f1f99abf06d0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 16:36:33 +0100 Subject: linkchecker: Fix disabledTestPaths on darwin `tests/checker/test_noproxy.py` was removed in https://github.com/linkchecker/linkchecker/commit/fe5a34c68f7a16443413898192eb1db25b10b506 https://github.com/linkchecker/linkchecker/pull/589 --- pkgs/tools/networking/linkchecker/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 3d245abf3765d..c78c12c8fa776 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -51,7 +51,6 @@ python3.pkgs.buildPythonApplication rec { ] ++ lib.optionals stdenv.isDarwin [ "tests/checker/test_content_allows_robots.py" "tests/checker/test_http*.py" - "tests/checker/test_noproxy.py" "tests/test_network.py" ]; -- cgit 1.4.1