generated from nix-community/nur-packages-template
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/master'
- Loading branch information
Showing
8 changed files
with
2,100 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
<<<<<<< HEAD | ||
carla-git: ade014c97194486692c260b7cc09b04a92e58305 → 41f07e119252b8b14627bec8345cb7304485a815 | ||
cardinal: 65cf557a6b023ffc9d43dd97e59bb0b410f23889 → da276ee93811c98571663b2e63309eba4eec6915 | ||
======= | ||
>>>>>>> master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1146,10 +1146,17 @@ | |
}; | ||
"sponsorblock" = buildFirefoxXpiAddon { | ||
pname = "sponsorblock"; | ||
<<<<<<< HEAD | ||
version = "5.4.24"; | ||
addonId = "[email protected]"; | ||
url = "https://addons.mozilla.org/firefox/downloads/file/4181516/sponsorblock-5.4.24.xpi"; | ||
sha256 = "3624120b2d8d64ab9b0aa535784fa38e1914b6a0dc043d391fd5c4a96eec4f54"; | ||
======= | ||
version = "5.4.25"; | ||
addonId = "[email protected]"; | ||
url = "https://addons.mozilla.org/firefox/downloads/file/4185110/sponsorblock-5.4.25.xpi"; | ||
sha256 = "7bb6d42b76acca487be8e11af23db9c3df916b40e3665446d6335d3e1c7a16f4"; | ||
>>>>>>> master | ||
meta = with lib; { | ||
homepage = "https://sponsor.ajay.app"; | ||
description = "Easily skip YouTube video sponsors. When you visit a YouTube video, the extension will check the database for reported sponsors and automatically skip known sponsors. You can also report sponsors in videos.\n\nOther browsers: https://sponsor.ajay.app"; | ||
|
@@ -1166,10 +1173,10 @@ | |
}; | ||
"steam-database" = buildFirefoxXpiAddon { | ||
pname = "steam-database"; | ||
version = "3.7.2"; | ||
version = "3.7.3"; | ||
addonId = "[email protected]"; | ||
url = "https://addons.mozilla.org/firefox/downloads/file/4163150/steam_database-3.7.2.xpi"; | ||
sha256 = "d53ebbb78cab59de0111ededc3a66ff98a8ecf5580d09608579a3692d34682eb"; | ||
url = "https://addons.mozilla.org/firefox/downloads/file/4185700/steam_database-3.7.3.xpi"; | ||
sha256 = "8f30be33fc633489e9b2e2e0b225ab83cd497603b9d6de01582190e15b58ccf9"; | ||
meta = with lib; { | ||
homepage = "https://steamdb.info/"; | ||
description = "Adds SteamDB links and new features on the Steam store and community. View lowest game prices and stats."; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.