From 0cb5ad876b1a60b6a644230cf15562fe43137475 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 18 Oct 2022 16:32:14 +0200 Subject: [PATCH] overlays: wik, swaynotificationcenter use nvfetcher --- overlays/python-wik.nix | 10 +--------- overlays/swaynotificationcenter.nix | 8 +------- pkgs/_sources/generated.nix | 22 ++++++++++++++++++++++ pkgs/sources.toml | 8 ++++++++ 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/overlays/python-wik.nix b/overlays/python-wik.nix index 497385a7..f0a24112 100644 --- a/overlays/python-wik.nix +++ b/overlays/python-wik.nix @@ -1,14 +1,6 @@ final: prev: with prev.python310Packages; { python-wiki-fetch = buildPythonPackage rec { - pname = "wik-unstable"; - version = "2022-03-04"; - - src = prev.fetchFromGitHub { - owner = "yashsinghcodes"; - repo = "wik"; - rev = "aca76040770543a55b8fb0574901bf52df099c34"; - sha256 = "sha256-qFNRzgXFyOgIvtNKR+7NG5lvQObjgezfRaloA7VH9Lc="; - }; + inherit (prev.sources.wik) pname version src; checkPhase = '' cd test diff --git a/overlays/swaynotificationcenter.nix b/overlays/swaynotificationcenter.nix index 339d923c..311847bd 100644 --- a/overlays/swaynotificationcenter.nix +++ b/overlays/swaynotificationcenter.nix @@ -1,12 +1,6 @@ final: prev: { swaynotificationcenter-master = prev.swaynotificationcenter.overrideAttrs (oldAttrs: { - version = "unstable-2022-07-11"; - src = prev.fetchFromGitHub { - owner = "ErikReider"; - repo = "SwayNotificationCenter"; - rev = "4f142f54f6af6882338f5ce2e9ac529be523f841"; - sha256 = "sha256-BF2EZ/0gPtBRAIFvAGhHkp+0H9EA7zYjN8ujDmdHfo0="; - }; + 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 f8bdd149..00ade142 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -34,6 +34,17 @@ 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"; @@ -89,4 +100,15 @@ sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; }); }; + wik = { + pname = "wik"; + version = "aca76040770543a55b8fb0574901bf52df099c34"; + src = fetchFromGitHub ({ + owner = "yashsinghcodes"; + repo = "wik"; + rev = "aca76040770543a55b8fb0574901bf52df099c34"; + fetchSubmodules = false; + sha256 = "sha256-qFNRzgXFyOgIvtNKR+7NG5lvQObjgezfRaloA7VH9Lc="; + }); + }; } diff --git a/pkgs/sources.toml b/pkgs/sources.toml index b3535048..ba9832d9 100644 --- a/pkgs/sources.toml +++ b/pkgs/sources.toml @@ -3,6 +3,14 @@ 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" + [rnix-lsp-nvfetcher] src.git = "https://github.com/nix-community/rnix-lsp" fetch.github = "nix-community/rnix-lsp"