From 418a762043c47d8073b1d039223684d5c9a94db3 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Fri, 24 Sep 2021 18:04:17 +0200 Subject: [PATCH 1/4] psi-notify: init at 1.2.1 (cherry picked from commit 37ec684a5c010aa7cf51abaf29691ef2333d6625) --- pkgs/applications/misc/psi-notify/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/misc/psi-notify/default.nix diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/applications/misc/psi-notify/default.nix new file mode 100644 index 00000000000..5a4b6f385df --- /dev/null +++ b/pkgs/applications/misc/psi-notify/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, systemd, libnotify, pkg-config }: + +stdenv.mkDerivation rec { + pname = "psi-notify"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = pname; + rev = version; + sha256 = "0hn37plim1smmlrjjmz8kybyms8pz3wxcgf8vmqjrsqi6bfcym7g"; + }; + + buildInputs = [ systemd libnotify ]; + nativeBuildInputs = [ pkg-config ]; + + installPhase = '' + runHook preInstall + + install -D psi-notify $out/bin/psi-notify + substituteInPlace psi-notify.service --replace psi-notify $out/bin/psi-notify + install -D psi-notify.service $out/share/systemd/user/psi-notify.service + + runHook postInstall + ''; + + meta = with lib; { + description = "Alert on system resource saturation"; + longDescription = '' + psi-notify can alert you when resources on your machine are becoming + oversaturated, and allow you to take action before your system slows to a + crawl. + ''; + license = licenses.mit; + homepage = "https://github.com/cdown/psi-notify"; + platforms = platforms.linux; + maintainers = with maintainers; [ eduarrrd ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94dc6acf06a..941dbd125f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25437,6 +25437,8 @@ in prevo-data = callPackage ../applications/misc/prevo/data.nix { }; prevo-tools = callPackage ../applications/misc/prevo/tools.nix { }; + psi-notify = callPackage ../applications/misc/psi-notify { }; + ptex = callPackage ../development/libraries/ptex {}; pyright = nodePackages.pyright; From f203c410984d1900f8b7c6efcf253575b99954f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Sep 2021 07:30:23 +0000 Subject: [PATCH 2/4] playerctl: 2.3.1 -> 2.4.1 (cherry picked from commit b01290e0ecef1b2a57760fdd0facf0f0f48610ae) Reason: fixes a crash with TrackList and Playlists interfaces [1] [1]: https://github.com/altdesktop/playerctl/pull/215 --- pkgs/tools/audio/playerctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 15ebb93e4e8..d9f408bf9ed 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "playerctl"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn"; + sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY="; }; nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ]; From 17ee0b23fe51aa38cbabfd6e3d185887e9f938cc Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 24 Sep 2021 18:19:53 +0200 Subject: [PATCH 3/4] nix-output-monitor: 1.0.3.2 -> 1.0.3.3 (cherry picked from commit f779a0ff03497e83dab5b04182c13cd2ef347274) --- pkgs/tools/nix/nix-output-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 94c5f0afb2c..a94ae45ccea 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.2"; + version = "1.0.3.3"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "0srfclmqrqcx8b756yxww24ya0xn2ajxbgj07mcvdvwbwl09pys8"; + sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8"; rev = "v${version}"; }; isLibrary = true; From 9e29f211ba3b431d0f3a6b32ba74cb92067691e0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 20 Sep 2021 10:22:42 +0200 Subject: [PATCH 4/4] nixUnstable: 2.4pre20210908_3c56f62 -> 2.4pre20210922_bcd73eb Changes: https://github.com/nixos/nix/compare/3c56f62...bcd73eb I figured that now with an actual 2.4 release around the corner[1] we could bump it a bit more often considering that it seems to contain mostly bugfixes, so that upstream receives a bit more feedback. [1] https://discourse.nixos.org/t/tweag-nix-dev-update-17/15037 (cherry picked from commit 615d368aa000279f1c63d9c5521859181b5fbfe3) --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ad2fe6bb97b..a5fb98d7557 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -228,13 +228,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210908_${lib.substring 0 7 src.rev}"; + suffix = "pre20210922_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3c56f62093601143838af923195f630d8ffae2d4"; - sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc="; + rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; + sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; }; boehmgc = boehmgc_nixUnstable;