fix: grimorie bump to electron 40 #15

Closed
doloro wants to merge 14 commits from doloro/pkgs-nikkuss:grimorie into main
2 changed files with 1 additions and 16 deletions
Showing only changes of commit cccc55ef78 - Show all commits
-4
View File
@@ -41,10 +41,6 @@ cargo_lock = ["Cargo.lock"]
src.github = "Slush97/grimoire" src.github = "Slush97/grimoire"
fetch.github = "Slush97/grimoire" fetch.github = "Slush97/grimoire"
# [grimoire-social]
# src.github = "Slush97/grimoire-social"
# fetch.github = "Slush97/grimoire-social"
[vpkmerge] [vpkmerge]
src.github = "Slush97/vpkmerge" src.github = "Slush97/vpkmerge"
fetch.github = "Slush97/vpkmerge" fetch.github = "Slush97/vpkmerge"
+1 -12
View File
1
@@ -19,14 +19,8 @@
sources = callPackage ../../../../_sources/generated.nix {}; sources = callPackage ../../../../_sources/generated.nix {};
src = sources.grimoire.src; src = sources.grimoire.src;
# src = fetchFromGitHub {
# owner = "Slush97";
# repo = "grimoire";
# rev = "v${version}";
# hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
# };
# grimoire-social-src = sources.grimoire-social.src; # This would go into nvfetcher but it isnt versioned..
grimoire-social-src = fetchFromGitHub { grimoire-social-src = fetchFromGitHub {
owner = "Slush97"; owner = "Slush97";
repo = "grimoire-social"; repo = "grimoire-social";
@@ -40,11 +34,6 @@
fetcherVersion = 2; fetcherVersion = 2;
Outdated
Review

bump to fetcherVersion 3

bump to fetcherVersion 3
hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s="; hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s=";
}; };
# Put into its own flake
# vpkmerge-bin = fetchurl {
# url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
# sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
# };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "grimoire"; pname = "grimoire";