From 5e64b273951ade00cfc2344900b172eff1e53298 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Fri, 16 Dec 2022 00:27:47 +1000 Subject: [PATCH] have to keep tic80 on v0.8 --- flake.lock | 8 ++++---- pkgs/tic-80.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 52029b43..0f3bf3f3 100644 --- a/flake.lock +++ b/flake.lock @@ -312,11 +312,11 @@ "vimwiki-cli": "vimwiki-cli" }, "locked": { - "lastModified": 1670943608, - "narHash": "sha256-GH4QqSKh8qTY/O58QcOjlgncJq6+VmtqPrIvbFnQAI0=", + "lastModified": 1671087600, + "narHash": "sha256-4bqDxf1tJxAg7AWasCFN4U6jgpRLlZnHBNNEimDAcPQ=", "ref": "main", - "rev": "9eabdc3c6f3c16057d49261318375fbc3256a33b", - "revCount": 456, + "rev": "0d62eb676164faa2c3020f9c8f8e26c4397d05c3", + "revCount": 459, "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" }, diff --git a/pkgs/tic-80.nix b/pkgs/tic-80.nix index 1ef148eb..0c4e3894 100644 --- a/pkgs/tic-80.nix +++ b/pkgs/tic-80.nix @@ -1,11 +1,11 @@ # Stolen from: https://gist.github.com/jjwatt/c83c02e6903c8ffaf546fe5eb27e7d25?permalink_comment_id=3305141#gistcomment-3305141 { pkgs, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { name = "tic-80"; - src = builtins.fetchGit { - fetchSubmodules = true; + src = pkgs.fetchgit { + fetchSubmodules = true; # not supported by builtins.fetchGit :( url = "https://github.com/nesbox/TIC-80"; - rev = "0feb848378fc40d16aaa609ed7a2148d7a064ac4"; + rev = "0feb848378fc40d16aaa609ed7a2148d7a064ac4"; # v0.8 didn't look at what changed in the newer versions sha256 = "12fl9wfc1577rmzcll50r3hq582010bpwd3yi15ji2vadc2q1w9l"; }; buildInputs = with pkgs; [ @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { cp -v bin/tic80 $out/bin ''; - tic80Item = makeDesktopItem { + tic80Item = pkgs.makeDesktopItem { name = "TIC-80"; exec = "tic80"; comment = "Tiny Computer"; - categories = "Development;Game"; + categories = [ "Development" "Game" ]; desktopName = "TIC-80"; }; }