From cf2b9e2c54148e47f071c9f4fd6ce7b3772f5513 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 19 Oct 2022 17:13:18 +0200 Subject: [PATCH] swaynotificationcenter: use version from nixpkgs-unstable --- modules/sway/default.nix | 2 +- ...notificationcenter-remove-post-install.patch | 11 ----------- overlays/swaynotificationcenter.nix | 8 -------- pkgs/_sources/generated.nix | 17 +++-------------- pkgs/sources.toml | 4 ---- 5 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 overlays/swaynotificationcenter-remove-post-install.patch delete mode 100644 overlays/swaynotificationcenter.nix diff --git a/modules/sway/default.nix b/modules/sway/default.nix index 8daa0307..1d0a4fbd 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -61,7 +61,7 @@ in kanshi mako slurp - swaynotificationcenter-master + swaynotificationcenter swayidle swaylock swaybg diff --git a/overlays/swaynotificationcenter-remove-post-install.patch b/overlays/swaynotificationcenter-remove-post-install.patch deleted file mode 100644 index 5615dd15..00000000 --- a/overlays/swaynotificationcenter-remove-post-install.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/meson.build b/meson.build -index 6557624..f82460e 100644 ---- a/meson.build -+++ b/meson.build -@@ -126,6 +126,3 @@ if get_option('man-pages') - endforeach - endif - endif -- --# Run the postinstall script when installing --meson.add_install_script('build-aux/meson/postinstall.py') diff --git a/overlays/swaynotificationcenter.nix b/overlays/swaynotificationcenter.nix deleted file mode 100644 index 311847bd..00000000 --- a/overlays/swaynotificationcenter.nix +++ /dev/null @@ -1,8 +0,0 @@ -final: prev: { - swaynotificationcenter-master = prev.swaynotificationcenter.overrideAttrs (oldAttrs: { - inherit (prev.sources.swaynotificationcenter) pname version src; - patches = [ - ./swaynotificationcenter-remove-post-install.patch - ]; - }); -} diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index da44f523..83e13eab 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -36,13 +36,13 @@ }; ohmyzsh = { pname = "ohmyzsh"; - version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; + version = "a7d910c3a61d8599f748a8ddae59ecdd9424022a"; src = fetchFromGitHub ({ owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; + rev = "a7d910c3a61d8599f748a8ddae59ecdd9424022a"; fetchSubmodules = false; - sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw="; + sha256 = "sha256-BWpvRkUXQhP1VLrlTBqqXvycyPFZaIZmgMfrkqIugSY="; }); }; powerlevel10k = { @@ -67,17 +67,6 @@ sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q="; }); }; - swaynotificationcenter = { - pname = "swaynotificationcenter"; - version = "1ef364c3342b0ddf90033a661a57996974a2b4a5"; - src = fetchFromGitHub ({ - owner = "ErikReider"; - repo = "SwayNotificationCenter"; - rev = "1ef364c3342b0ddf90033a661a57996974a2b4a5"; - fetchSubmodules = false; - sha256 = "sha256-8oUgInYjde1R5nR7HLC5VYXdTUc6YwaBItXKQW1KJYE="; - }); - }; vim-apprentice-nvfetcher = { pname = "vim-apprentice-nvfetcher"; version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659"; diff --git a/pkgs/sources.toml b/pkgs/sources.toml index fed21b29..f50ea8ca 100644 --- a/pkgs/sources.toml +++ b/pkgs/sources.toml @@ -3,10 +3,6 @@ src.git = "https://github.com/mlvzk/manix" fetch.github = "mlvzk/manix" -[swaynotificationcenter] -src.git = "https://github.com/ErikReider/SwayNotificationCenter" -fetch.github = "ErikReider/SwayNotificationCenter" - [wik] src.git = "https://github.com/yashsinghcodes/wik" fetch.github = "yashsinghcodes/wik"