Green-Sky/totato
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix and update nix flake

Browse Source
This commit is contained in:
Green Sky 2025-01-12 16:45:23 +01:00
parent bc09f94a70
commit e77e57fa78
No known key found for this signature in database
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@ -20,16 +20,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694553957, "lastModified": 1736692550,
"narHash": "sha256-8o15HEax53lBJjjcr5VHMpuuT6vBcrzSNB6y2iGlPaU=", "narHash": "sha256-7tk8xH+g0sJkKLTJFOxphJxxOjMDFMWv24nXslaU2ro=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7fe745d22df5fa282b321e577fe18d4f62e0f0b", "rev": "7c4869c47090dd7f9f1bdfb49a22aea026996815",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.05", "ref": "release-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

37
flake.nix
View File

@ -4,7 +4,7 @@
# https://youtu.be/7ZeTP_S6ZVI # https://youtu.be/7ZeTP_S6ZVI
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -18,8 +18,8 @@
toxcore-src = pkgs.fetchFromGitHub { toxcore-src = pkgs.fetchFromGitHub {
owner = "TokTok"; repo = "c-toxcore"; owner = "TokTok"; repo = "c-toxcore";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v0.2.19"; rev = "v0.2.20";
hash = "sha256-6pdyQpHwYwUBeeHVuH/YTYdlOAtRgvrSuFE6Wlh+BnM="; hash = "sha256-jJk3K1wDG84NtMQBmNvSDRMPYUsYIzjE0emiZ4Ugbhk=";
}; };
entt-src = pkgs.fetchFromGitHub { entt-src = pkgs.fetchFromGitHub {
owner = "skypjack"; repo = "entt"; owner = "skypjack"; repo = "entt";
@ -28,33 +28,38 @@
}; };
solanaceae_util-src = pkgs.fetchFromGitHub { solanaceae_util-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_util"; owner = "Green-Sky"; repo = "solanaceae_util";
rev = "17b4cce69b1e1712239700b4b13b242e61ca7d62"; rev = "6cbcc9463ce3c4344e06d74d7df67175ada83b5f";
hash = "sha256-QNLZgByoZsrXtAWk1i6O1bUkheWop/Oi/V9ggANFcgE="; hash = "sha256-puWLMzCWLBQEsslIJE9sGA7fqp8v93J4zixyu64TqhY=";
}; };
solanaceae_contact-src = pkgs.fetchFromGitHub { solanaceae_contact-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_contact"; owner = "Green-Sky"; repo = "solanaceae_contact";
rev = "e40271670b4df96a8d02f32a1ba61a838419db48"; rev = "e2917c497c91f91f8febcd1f43e462fad8359305";
hash = "sha256-a/G1hpkZlnRF0Reg3PgJuToZclukImVDff3CpzSGz4k="; hash = "sha256-gM9aT+lk+TmgiLyIeaGvHSpo55C+RNEnJvzFPLXrVMc=";
}; };
solanaceae_message3-src = pkgs.fetchFromGitHub { solanaceae_message3-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_message3"; owner = "Green-Sky"; repo = "solanaceae_message3";
rev = "7c28b232a46ebede9d6f09bc6eafb49bacfa99ea"; rev = "e55fb46027f16a1bc078f797ae9fcc7609d15659";
hash = "sha256-Ufb8qs/Tz2nHmUOMt8gsNDjf3+8YyoT7sTwYnsFQkC0="; hash = "sha256-BdwHBCXWLiVL26djyasQEPW1PbwKCkeXdUivkPaQD3c=";
}; };
solanaceae_plugin-src = pkgs.fetchFromGitHub { solanaceae_plugin-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_plugin"; owner = "Green-Sky"; repo = "solanaceae_plugin";
rev = "82cfb6d4920a2d6eb19e3f3560b20ec281a5fa81"; rev = "54cd23433df4acedede51e932f27d16fe4f35548";
hash = "sha256-3Bx9FHHze7MDxvHBEd3Ya/m05X5qMugoV4MUs1vtcZs="; hash = "sha256-Yy58w1PJFzIiN8kjqe7zerG9HewcdlBcN9P/YsjFCQs=";
}; };
solanaceae_toxcore-src = pkgs.fetchFromGitHub { solanaceae_toxcore-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_toxcore"; owner = "Green-Sky"; repo = "solanaceae_toxcore";
rev = "cf3679018be3f90db0f2f1e9433a966692976421"; rev = "727c341899a82c911a27a5cac6d09bb23ce06b1d";
hash = "sha256-XnsQR6TYhZWNSVjxe4wJdSD2WVdGM8ZHGmzrDlDyJC4="; hash = "sha256-pI0ZKX6h/DMC9m0z4yC38kqGRP34ES12U9LcuO14fO0=";
}; };
solanaceae_tox-src = pkgs.fetchFromGitHub { solanaceae_tox-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_tox"; owner = "Green-Sky"; repo = "solanaceae_tox";
rev = "ce81ef7cf7cea2fe2091912c9eafe787cbba6100"; rev = "8ad10978b96837eb7949f32ef433c5b37c2aa458";
hash = "sha256-2NwD5Dv6almBRNb8FTuzmiGDWFNZdPPIwJ1etWETpLE="; hash = "sha256-0eV8tf1CDG1xHxKmDHBMSP/5hMoB2qRagOj1meHcEFY=";
};
solanaceae_object_store-src = pkgs.fetchFromGitHub {
owner = "Green-Sky"; repo = "solanaceae_object_store";
rev = "18d2888e3452074245375f329d90520ac250b595";
hash = "sha256-vfFepPHj58c8YBSa8G8bJjD6gcCj65T0Kx5aEhqsjok=";
}; };
pname = "totato"; pname = "totato";
@ -78,7 +83,9 @@
"-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_PLUGIN=${solanaceae_plugin-src}" "-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_PLUGIN=${solanaceae_plugin-src}"
"-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_TOXCORE=${solanaceae_toxcore-src}" "-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_TOXCORE=${solanaceae_toxcore-src}"
"-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_TOX=${solanaceae_tox-src}" "-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_TOX=${solanaceae_tox-src}"
"-DFETCHCONTENT_SOURCE_DIR_SOLANACEAE_OBJECT_STORE=${solanaceae_object_store-src}"
"-DFETCHCONTENT_SOURCE_DIR_JSON=${pkgs.nlohmann_json.src}" # we care less about version here "-DFETCHCONTENT_SOURCE_DIR_JSON=${pkgs.nlohmann_json.src}" # we care less about version here
"-DFETCHCONTENT_SOURCE_DIR_ZSTD=${pkgs.zstd.src}"
]; ];
# TODO: replace with install command # TODO: replace with install command